Skip to content

Commit 0d8ccc3

Browse files
makorsaarushtools
authored andcommitted
style: improve responsiveness and ux
1 parent 2f07af3 commit 0d8ccc3

File tree

18 files changed

+118
-113
lines changed

18 files changed

+118
-113
lines changed

intranet/static/css/bus.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,12 @@ div.selectize-input.full {
284284
width: 220px;
285285
}
286286

287+
@media (min-width: 1400px) {
288+
.selectize-input {
289+
width: 90%;
290+
}
291+
}
292+
287293
.update-button {
288294
display: block;
289295

intranet/static/css/dashboard.scss

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
}
1313

1414
h2 {
15-
padding-left: 10px;
1615
line-height: 38px;
1716
float: left;
1817
}
@@ -39,7 +38,7 @@
3938
}
4039

4140
.announcements-header {
42-
height: 38px;
41+
overflow: hidden;
4342
margin-bottom: 4px;
4443
}
4544

@@ -120,9 +119,10 @@ a.club-announcement-meta-link:visited {
120119
}
121120

122121
.announcements-icon-wrapper:has(> .club-announcements-button) {
123-
@media (max-width: 800px) {
122+
@media (max-width: 1120px) {
124123
display: block !important;
125124
width: 100%;
125+
margin-bottom: 6px;
126126
}
127127

128128
@media (max-width: 550px) {
@@ -236,6 +236,12 @@ a.club-announcement-meta-link:visited {
236236
float: right;
237237
}
238238

239+
@media (max-width: 515px) {
240+
.announcements-icon-wrapper {
241+
float: left;
242+
}
243+
}
244+
239245
.announcement-metadata {
240246
color: rgb(144, 144, 144);
241247
font-size: 12px;
@@ -322,17 +328,6 @@ a.button {
322328
text-align: center;
323329
}
324330

325-
@media (max-width: 800px) {
326-
/*
327-
* widgets that fall underneath nav shouldn't float
328-
* all the way to the left in 800-500px tablet view.
329-
* mainly affects student admins
330-
*/
331-
ul.nav {
332-
margin-bottom: 100%;
333-
}
334-
}
335-
336331
/*
337332
* between 800px and 662px, show a two column widget view
338333
* nonfunctional

intranet/static/css/dashboard.widgets.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ $font-stack: "Open Sans", "Helvetica Neue", sans-serif;
8484
color: red;
8585
}
8686

87-
.widget .widget-title .warning i {
88-
//color: rgb(255, 72, 72);
89-
}
87+
// .widget .widget-title .warning i {
88+
// //color: rgb(255, 72, 72);
89+
// }
9090

9191
.main div.widgets {
9292
@media (max-width: 355px) {
@@ -398,14 +398,14 @@ a#eighth-sponsor {
398398

399399
@media (max-width: 800px) {
400400
display: block;
401-
width: calc(100% - 75px);
401+
width: calc(100% - 78px);
402402

403403
body.show-extra-widgets & {
404404
display: none;
405405
}
406406
}
407407

408-
@media (max-width: 550px) {
408+
@media (max-width: 680px) {
409409
width: 100%;
410410
}
411411
}

intranet/static/css/events.scss

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
@import "colors";
22

3+
.primary-content {
4+
position: relative;
5+
}
6+
37
.events {
48
min-width: 290px; // for 320x480 screens
59
max-width: 1000px;
6-
margin-bottom: 100px;
710

811
h2 {
9-
padding-left: 10px;
1012
line-height: 38px;
1113

1214
&.category {
1315
font-size: 18px;
1416
font-weight: normal;
15-
padding-left: 10px;
1617
height: 33px;
1718
}
1819
}
1920
}
2021

2122
.button-container {
22-
float: right;
23-
margin-top: -38px;
23+
position: absolute;
24+
right: 0;
25+
top: 0;
2426
}
2527

2628
.button-subcontainer {
2729
display: inline-block;
2830
margin-right: 5px;
2931
}
3032

31-
@media (max-width: 1080px) {
33+
@media (max-width: 570px) {
34+
.events {
35+
max-width: none;
36+
}
3237
.button-container {
33-
margin-top: auto;
34-
margin-bottom: 5px;
38+
position: static;
3539
}
40+
}
41+
42+
@media (max-width: 1225px) {
3643
.arrow-container {
3744
margin-bottom: -20px !important;
3845
}
3946

40-
.events-container > .event:nth-child(2) {
41-
margin-top: 43px;
42-
@media (max-width: 387px) {
43-
margin-top: 80px;
44-
}
45-
}
46-
4747
.week-only {
4848
position: relative;
49-
right: 8.5%;
49+
right: 0;
5050

5151
& > tbody > tr > td {
5252
display: block;
5353
border-bottom: 1px solid lightgrey;
5454
padding: 20px 0 !important;
55-
width: 120%;
55+
width: 100%;
5656

5757
&:first-child {
5858
border-top: 1px solid lightgrey;
@@ -139,13 +139,14 @@
139139
}
140140
}
141141

142-
@media (max-width: 710px) {
142+
/* these values are mostly arbitrary but were collected manually and do work */
143+
@media (max-width: 710px), (min-width: 960px) and (max-width: 1000px), (min-width: 800px) and (max-width: 880px) {
143144
.bottom-row {
144-
margin-bottom: 23px;
145+
margin-bottom: 15px;
145146

146147
.attend-status {
147148
left: 0;
148-
bottom: -27px;
149+
bottom: -15px;
149150
}
150151
}
151152
}
@@ -321,6 +322,7 @@ span.approve-reject {
321322
width: 19%;
322323
padding: 10px !important;
323324
border: 1px solid lightgrey;
325+
vertical-align: top;
324326

325327
h2 {
326328
font-weight: normal;

intranet/static/css/page_base.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ h1 {
200200
.header .csl-apps {
201201
display: inline-block;
202202
position: relative;
203-
padding: 0 10px 0 0;
203+
padding: 0 6px 0 0;
204204
line-height: normal;
205205

206206
.fa-user, .fa-th {
@@ -241,10 +241,6 @@ h1 {
241241
color: white;
242242
}
243243

244-
.header .username {
245-
margin-right: 10px;
246-
}
247-
248244
.header .dropdown-menu {
249245
display: none;
250246
opacity: 0;

intranet/static/css/printing.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
width: 60%;
1313
}
1414

15+
@media (max-width: 600px) {
16+
.primary-content form {
17+
width: 100%;
18+
}
19+
}
20+
1521
.print-status-container {
1622
float: left;
1723
padding: 10px;

intranet/static/css/responsive.core.scss

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body.disable-scroll {
1212

1313
@media (max-width: 800px) {
1414
.header .search input[type="text"] {
15-
width: 158px;
15+
width: 250px;
1616
font-size: 12px;
1717
padding-right: 3px;
1818
}
@@ -45,6 +45,10 @@ body.disable-scroll {
4545
position: absolute !important;
4646
top: 4px;
4747
left: 60px;
48+
49+
body.mobile-nav-show & {
50+
display: none;
51+
}
4852
}
4953

5054
.status-icon {
@@ -88,10 +92,10 @@ body.disable-scroll {
8892
}
8993
}
9094

91-
&.has-badge .left > form.search {
95+
//&.has-badge .left > form.search {
9296
//width: 50%;
9397
//left: 20%;
94-
}
98+
//}
9599
}
96100
.left > a.intranet-title {
97101
position: absolute;
@@ -158,8 +162,6 @@ body.disable-scroll {
158162
height: 100%;
159163
height: calc(100% - 42px);
160164
overflow-y: auto;
161-
background-color: rgb(242, 242, 244);
162-
//background-color: rgb(56, 56, 56);
163165
border-radius: 0;
164166
border: none;
165167
/*
@@ -273,6 +275,7 @@ body.disable-scroll {
273275
cursor: pointer;
274276
}
275277
.intranet-title,
278+
.status-link,
276279
.search {
277280
transition: all 0.2s ease;
278281
-webkit-transition: all 0.2s ease;
@@ -287,9 +290,30 @@ body.disable-scroll {
287290
* screens (320x480, iPhone 4)
288291
*/
289292

290-
@media (max-width: 325px) {
293+
@media (max-width: 420px) {
291294
body {
292295
padding-left: 6px;
293296
padding-right: 6px;
294297
}
298+
299+
// overlaps with the search bar otherwise
300+
body.mobile-nav-show {
301+
.right {
302+
display: none;
303+
}
304+
305+
.left {
306+
text-align: center;
307+
308+
// otherwise the search bar is too close to the back button
309+
> form.search {
310+
left: 20%;;
311+
}
312+
}
313+
314+
// search bar only shows when the mobile nav menu is active
315+
.search input[type="text"] {
316+
width: 180px; // using the space freed by no right buttons
317+
}
318+
}
295319
}

intranet/static/css/responsive.scss

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,23 @@
2929
position: static;
3030
height: auto;
3131
width: 100%;
32+
}
33+
34+
div.announcements {
35+
padding-right: 0;
36+
}
37+
}
38+
39+
/* if the min isnt 680 everything will be slightly shifted to the left on mobile */
40+
@media (min-width: 681px) and (max-width: 800px) {
41+
div.widgets {
3242
width: calc(100% - 16px);
33-
margin-bottom: 10px;
3443

3544
.widget {
3645
position: relative;
3746
left: 16px;
3847
}
3948
}
40-
div.announcements {
41-
padding-right: 0;
42-
}
4349
}
4450
}
4551

0 commit comments

Comments
 (0)