Skip to content
Browse files

added separate style for frontend editing, fixed mobile login page

  • Loading branch information...
1 parent 849735c commit 34f110cdb35c68ea503c003c6f299b1657b2670a @alesdotio alesdotio committed
View
20 djangocms_admin_style/sass/_settings.scss
@@ -152,16 +152,16 @@ $tree-width: 250px;
//@import "compass/css3/font-face"
-@font-face {
- font-family: 'django-admin-icons';
- src:url('../fonts/django-admin-icons.eot');
- src:url('../fonts/django-admin-icons.eot?#iefix') format('embedded-opentype'),
- url('../fonts/django-admin-icons.svg#django-admin-icons') format('svg'),
- url('../fonts/django-admin-icons.woff') format('woff'),
- url('../fonts/django-admin-icons.ttf') format('truetype');
- font-weight: normal;
- font-style: normal;
-}
+//@font-face {
+// font-family: 'django-admin-icons';
+// src:url('../fonts/django-admin-icons.eot');
+// src:url('../fonts/django-admin-icons.eot?#iefix') format('embedded-opentype'),
+// url('../fonts/django-admin-icons.svg#django-admin-icons') format('svg'),
+// url('../fonts/django-admin-icons.woff') format('woff'),
+// url('../fonts/django-admin-icons.ttf') format('truetype');
+// font-weight: normal;
+// font-style: normal;
+//}
// Then we'll import the compass extension
View
3 djangocms_admin_style/sass/djangocms-admin-frontend.scss
@@ -0,0 +1,3 @@
+#header, .breadcrumbs { display: none; }
+.login #header { display: block; }
+#container { margin-top: 40px; }
View
23 djangocms_admin_style/sass/djangocms-admin-mobile.scss
@@ -1,20 +1,33 @@
-@import "_settings.scss";
+@import "_compass.scss";
// base
html, body { height: auto; }
-#header, .breadcrfumbs { display: none; }
#content { margin: 0 5px; }
-#container { margin: 0; margin-top: 31px; min-width: 250px !important; }
+#container { margin: 0; min-width: 200px !important; }
+#branding { display: none; }
+.login #branding { display: block; }
// general
.module {
border: none; box-shadow: none; padding: 5px 0 5px 0 !important;
@include box-shadow(none !important);
- caption { margin-bottom: 5px; }
+ caption { margin-bottom: 5px; margin-left: 5px; }
}
div.breadcrumbs { padding-left: 5px; }
.plugin-holder { display: none !important; }
+// login
+body.login {
+ #container {
+ width: auto !important; max-width: 320px;
+ #content #content-main {
+ .form-row, .submit-row { text-align: center; }
+ .form-row input { width: auto !important; max-width: none; min-width: 40px; }
+ .submit-row input, .submit-row input[type="submit"] { width: 80% !important; }
+ }
+ }
+}
+
// dashboard
.colMS { margin-right: 10px !important; }
.dashboard {
@@ -80,7 +93,7 @@ div.breadcrumbs { padding-left: 5px; }
form label, .aligned label { display: block; padding: 0 !important; float: none !important;
line-height: 14px; margin-top: 5px; }
form {
- input, input[type="file"], textarea, select { width: auto; max-width: 200px; }
+ input, input[type="file"], textarea, select { width: auto; /*max-width: 200px;*/ }
.vTextField { width: auto; }
.aligned p, .aligned ul { padding-left: 0 !important; margin-left: 0 !important; }
.submit-row { text-align: left; }
View
1 djangocms_admin_style/sass/partials/_content.scss
@@ -136,6 +136,7 @@ div.breadcrumbs { background: $line-color-dark; border-top: 1px solid $line-colo
p { padding: 0; }
}
}
+ table tbody tr:hover { background: none; }
}
a.addlink {
View
5 djangocms_admin_style/static/cms/css/djangocms-admin-frontend.css
@@ -0,0 +1,5 @@
+#header, .breadcrumbs { display: none; }
+
+.login #header { display: block; }
+
+#container { margin-top: 40px; }
View
96 djangocms_admin_style/static/cms/css/djangocms-admin-mobile.css
@@ -1,97 +1,25 @@
-/* Dimensions */
-/* inactive */
-/* Silver */
-/* Blue */
-/* Orange */
-/* Red */
-/* Green */
-/* Black */
-/* Paddings */
-/* Template Editor */
-@font-face { font-family: 'django-admin-icons'; src: url("../fonts/django-admin-icons.eot"); src: url("../fonts/django-admin-icons.eot?#iefix") format("embedded-opentype"), url("../fonts/django-admin-icons.svg#django-admin-icons") format("svg"), url("../fonts/django-admin-icons.woff") format("woff"), url("../fonts/django-admin-icons.ttf") format("truetype"); font-weight: normal; font-style: normal; }
-
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 12px; vertical-align: baseline; }
-
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; }
-
-blockquote, q { quotes: none; }
-
-blockquote:before, blockquote:after, q:before, q:after { content: ""; content: none; }
-
-ins { background-color: #ff9; color: #000; text-decoration: none; }
-
-mark { background-color: #ff9; color: #000; font-style: italic; font-weight: bold; }
-
-del { text-decoration: line-through; }
-
-abbr[title], dfn[title] { border-bottom: 1px dotted; cursor: help; }
-
-table { border-collapse: collapse; border-spacing: 0; }
-
-hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
-
-body { font-size: 12px; font-family: "Lucida Grande", Verdana, Arial, sans-serif; line-height: 1.231; *font-size: small; }
-
-pre, code, kbd, samp { font-family: monospace, sans-serif; }
-
-html { overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
-
-ul, ol { margin-left: 2em; }
-
-ol { list-style-type: decimal; }
-
-td { vertical-align: top; }
-
-sub { font-size: 75%; line-height: 0; position: relative; bottom: -0.25em; }
-
-sup { font-size: 75%; line-height: 0; position: relative; top: -0.5em; }
-
-a:hover, a:active { outline: none; }
-
-pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; padding: 15px; }
-
-label, input[type="button"], input[type="submit"], input[type="image"], button { cursor: pointer; }
-
-button, input, select, textarea { width: auto; overflow: visible; margin: 0; font-size: 100%; font-family: sans-serif; vertical-align: baseline; }
-
-textarea { overflow: auto; vertical-align: text-top; }
-
-input::-moz-focus-inner, button::-moz-focus-inner { border: 0; padding: 0; }
-
-a:link { -webkit-tap-highlight-color: none; }
-
-.ie7 img { -ms-interpolation-mode: bicubic; }
-
-.ie6 legend, .ie7 legend { margin-left: -7px; }
-
-nav ul, nav li { margin: 0; list-style: none; list-style-image: none; }
-
-.ir { text-indent: -119988px; overflow: hidden; text-align: left; direction: ltr; background-repeat: no-repeat; }
-
-.hidden { display: none; visibility: hidden; }
-
-.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
-.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; }
-
-.clearfix { zoom: 1; }
-.clearfix:before, .clearfix:after { content: ""; display: table; }
-.clearfix:after { clear: both; }
-
html, body { height: auto; }
-#header, .breadcrfumbs { display: none; }
-
#content { margin: 0 5px; }
-#container { margin: 0; margin-top: 31px; min-width: 250px !important; }
+#container { margin: 0; min-width: 200px !important; }
+
+#branding { display: none; }
+
+.login #branding { display: block; }
.module { border: none; box-shadow: none; padding: 5px 0 5px 0 !important; -moz-box-shadow: none !important; -webkit-box-shadow: none !important; -o-box-shadow: none !important; box-shadow: none !important; }
-.module caption { margin-bottom: 5px; }
+.module caption { margin-bottom: 5px; margin-left: 5px; }
div.breadcrumbs { padding-left: 5px; }
.plugin-holder { display: none !important; }
+body.login #container { width: auto !important; max-width: 320px; }
+body.login #container #content #content-main .form-row, body.login #container #content #content-main .submit-row { text-align: center; }
+body.login #container #content #content-main .form-row input { width: auto !important; max-width: none; min-width: 40px; }
+body.login #container #content #content-main .submit-row input, body.login #container #content #content-main .submit-row input[type="submit"] { width: 80% !important; }
+
.colMS { margin-right: 10px !important; }
.dashboard #container #content h1 { display: none; }
@@ -128,7 +56,7 @@ div.breadcrumbs { padding-left: 5px; }
form label, .aligned label { display: block; padding: 0 !important; float: none !important; line-height: 14px; margin-top: 5px; }
-form input, form input[type="file"], form textarea, form select { width: auto; max-width: 200px; }
+form input, form input[type="file"], form textarea, form select { width: auto; /*max-width: 200px;*/ }
form .vTextField { width: auto; }
form .aligned p, form .aligned ul { padding-left: 0 !important; margin-left: 0 !important; }
form .submit-row { text-align: left; }
View
3 djangocms_admin_style/static/cms/css/djangocms-admin.css
@@ -8,8 +8,6 @@
/* Black */
/* Paddings */
/* Template Editor */
-@font-face { font-family: 'django-admin-icons'; src: url("../fonts/django-admin-icons.eot"); src: url("../fonts/django-admin-icons.eot?#iefix") format("embedded-opentype"), url("../fonts/django-admin-icons.svg#django-admin-icons") format("svg"), url("../fonts/django-admin-icons.woff") format("woff"), url("../fonts/django-admin-icons.ttf") format("truetype"); font-weight: normal; font-style: normal; }
-
html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 12px; vertical-align: baseline; }
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; }
@@ -288,6 +286,7 @@ div.breadcrumbs a:hover { color: #cccccc; text-decoration: none; }
.dashboard #container #content-related .module h2 { background: none; color: #888888; padding: 0 0 5px 0; }
.dashboard #container #content-related .module h3 { border-bottom: 1px solid #dddddd; line-height: 20px; margin: 0 0 5px 0; padding: 0; }
.dashboard #container #content-related .module p { padding: 0; }
+.dashboard #container table tbody tr:hover { background: none; }
a.addlink, a.addlink:link, a.addlink:visited { color: #9ab933; }
a.addlink:hover, a.addlink:focus, a.addlink:active { color: #8fad28; }
View
3 djangocms_admin_style/templates/admin/base_site.html
@@ -6,6 +6,9 @@
{% block extrahead %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/djangocms-admin.css" />
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/djangocms-admin-mobile.css" media="screen and (max-width: 420px)" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
+<script type="text/javascript">
+if (window.self!==window.top) { document.write('<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/djangocms-admin-frontend.css" />'); }
+</script>
{% include 'admin/inc/extrahead.html' %}{% endblock %}
{% block title %}{% include 'admin/inc/title.html' %}{% endblock %}

0 comments on commit 34f110c

Please sign in to comment.
Something went wrong with that request. Please try again.