Skip to content

Commit 0d981e6

Browse files
committed
Clean up language switcher and core-base styling.
1 parent 062ac72 commit 0d981e6

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

kolibri/core/assets/src/styles/main.styl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ html
2929
font-size: 100%
3030
text-size-adjust: 100%
3131
box-sizing: border-box
32-
overflow-y: scroll
3332
// from normalize v5
3433
line-height: 1.15
3534

kolibri/core/assets/src/views/core-base.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@
157157
158158
.content-container
159159
position: absolute
160-
overflow-y: scroll
161160
overflow-x: hidden
162161
right: 0
163162
bottom: 0

kolibri/core/assets/src/views/language-switcher/index.vue

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
<div>
44
<div v-if="footer" class="page-footer">
5-
<div>
6-
<ul class="language-list">
7-
<li v-for="language in languageOptions" :class="selectedLanguage===language.code ? 'selected item' : 'choice item'" @click="setAndSwitchLanguage(language.code)">
8-
{{ language.name }}
9-
</li>
10-
</ul>
11-
</div>
5+
<ul class="language-list">
6+
<li v-for="language in languageOptions" :class="selectedLanguage===language.code ? 'selected item' : 'choice item'" @click="setAndSwitchLanguage(language.code)">
7+
{{ language.name }}
8+
</li>
9+
</ul>
1210
</div>
1311
<core-modal
1412
v-if="showModal"
@@ -107,8 +105,10 @@
107105
});
108106
},
109107
setAndSwitchLanguage(languageCode) {
110-
this.selectedLanguage = languageCode;
111-
this.switchLanguage();
108+
if (languageCode != this.selectedLanguage) {
109+
this.selectedLanguage = languageCode;
110+
this.switchLanguage();
111+
}
112112
},
113113
closeModal() {
114114
this.internalModalOpen = false;
@@ -141,6 +141,7 @@
141141
padding-left: 32px
142142
padding-top: 16px
143143
padding-bottom: 16px
144+
text-align: center
144145
button
145146
float: right
146147
position: absolute
@@ -152,10 +153,14 @@
152153
list-style: none
153154
margin: 0
154155
padding: 0
156+
text-align: initial
157+
display: inline-block
155158
156159
.item
157160
display: inline-block
158161
padding-top: 6px
159162
padding-right: 20px
163+
&.choice
164+
cursor: pointer
160165
161166
</style>

kolibri/plugins/user/assets/src/views/index.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<core-base :navBarNeeded="navBarNeeded" :topLevelPageName="topLevelPageName" :appBarTitle="appBarTitle">
55
<component v-if="navBarNeeded" :is="currentPage"/>
66
</core-base>
7-
<component v-if="!navBarNeeded" :is="currentPage"/>
8-
<language-switcher v-if="!navBarNeeded" :footer="true"/>
7+
<div v-if="!navBarNeeded" class="full-page">
8+
<component :is="currentPage"/>
9+
<language-switcher :footer="true"/>
10+
</div>
911
</div>
1012

1113
</template>
@@ -72,4 +74,10 @@
7274
7375
@require '~kolibri.styles.definitions'
7476
77+
.full-page
78+
position: absolute
79+
top: 0
80+
height: 100%
81+
width: 100%
82+
7583
</style>

kolibri/plugins/user/assets/src/views/sign-in-page/index.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@
257257
background: $core-bg-canvas
258258
background: linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), url(./background.png) no-repeat center center fixed
259259
background-size: cover
260-
overflow-y: auto
261-
overflow-x: hidden
260+
overflow: hidden
262261
263262
#login-container
264263
display: block

0 commit comments

Comments
 (0)