Skip to content

Commit 18871e3

Browse files
committed
Merge pull request #342 from divio/feature/mobile-cleanup
Mobile cleanup + small bugfix
2 parents bbb0ea6 + 7a81fb9 commit 18871e3

File tree

5 files changed

+40
-25
lines changed

5 files changed

+40
-25
lines changed

djangocms_admin_style/sass/components/_base.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,15 @@ ul.errorlist {
250250
margin-bottom: 10px !important;
251251
background-color: transparent !important;
252252
border: 0 !important;
253+
a {
254+
&,
255+
&:link,
256+
&:hover,
257+
&:focus,
258+
&:visited {
259+
color: $gray-darkest;
260+
}
261+
}
253262
li {
254263
color: $color-danger !important;
255264
font-size: $font-size-normal !important;

djangocms_admin_style/sass/components/_mobile.scss

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ body {
1919
margin-right: 0;
2020
}
2121
}
22-
#branding {
23-
#site-name {
24-
display: none;
22+
23+
// arbitrary width because it doesn't fit
24+
@media (max-width: 500px) {
25+
#branding {
26+
#site-name {
27+
display: none;
28+
}
2529
}
2630
}
2731
.login #branding {
@@ -287,19 +291,26 @@ form {
287291
margin-left: 0 !important;
288292
padding-left: 0 !important;
289293
}
290-
// make sure that submit buttons are positioned correct on mobile #153
291-
.submit-row {
292-
text-align: left;
293-
.deletelink-box {
294-
float: none;
295-
display: inline-block;
296-
margin-bottom: 10px;
297-
}
298-
input {
299-
display: block;
300-
float: none;
301-
margin-bottom: 10px !important;
302-
margin-left: 0;
294+
295+
// arbitrary width because it doesn't fit on bigger than "mobile"
296+
// breakpoint, but still ok on "tablet"
297+
@media (max-width: 600px) {
298+
// make sure that submit buttons are positioned correct on mobile #153
299+
.submit-row {
300+
text-align: left;
301+
.deletelink-box {
302+
float: none;
303+
display: inline-block;
304+
margin-bottom: 10px !important;
305+
}
306+
input {
307+
display: block;
308+
float: none;
309+
margin-left: 0 !important;
310+
+ input {
311+
margin-bottom: 10px !important;
312+
}
313+
}
303314
}
304315
}
305316
}

djangocms_admin_style/sass/djangocms-admin.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
@import "settings/all";
88
@import "mixins/all";
99

10+
@import "libs/_html5-boilerplate.scss";
11+
@include html5-boilerplate;
12+
1013
//##############################################################################
1114
// IMPORT COMPONENTS
1215
@import "components/base";

djangocms_admin_style/sass/settings/_custom.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,3 @@ $btn-cms-active-hover-border: #8c8c8c;
5353
//##############################################################################
5454
// #SHADOW
5555
$base-box-shadow: 0 0 5px 0 rgba($black, 0.2);
56-
57-
58-
// Then we'll import the compass extension
59-
@import "libs/_html5-boilerplate.scss";
60-
61-
// Now, you can simply include everything
62-
// (except media) by uncommeting this line
63-
@include html5-boilerplate;

djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)