Browse files

removed extra css file for mobile, various fixes

  • Loading branch information...
1 parent e5365ac commit a1fa1b1e9ac32dc19ae1009657d20951c424fb6b @alesdotio alesdotio committed Jan 29, 2013
View
52 djangocms_admin_style/sass/devices/_mobile.scss
@@ -1,52 +0,0 @@
-// Imports
-@import "partials/_nav.scss";
-
-// Custom styles
-header .row .eightcol { padding-left: 0; padding-right: 0; } // Find a generic way to select
-
-.vr { display: none; }
-
-.logo.left { float: none!important; }
-
-button {
- margin: 10px;
-}
-
-.title-section {
- text-align: center;
- hr {
- display: none;
- }
- .main-control.right {
- float: none;
- padding: 20px 0 10px 0;
- }
-}
-
-
-section {
- @include border-radius(0);
-}
-
-.top-controls section .sub-section {
- padding: 20px 0;
-}
-
-.version-controls, .site-controls {
- float: none; text-align: center; padding: 20px 10px;
-}
-
-.row-lists .row strong { margin-left: 0; }
-
-.page-controls {
- text-align: center;
- padding: 10px 0;
- .right {
- float: none!important;
- }
-}
-
-
-.site-controls { padding-bottom: 10px; }
-
-footer { text-align: center; }
View
3 djangocms_admin_style/sass/devices/_pad.scss
@@ -1,3 +0,0 @@
-#quick-access {
- display: none;
-}
View
0 djangocms_admin_style/sass/devices/_retina.scss
No changes.
View
14 djangocms_admin_style/sass/devices/partials/_nav.scss
@@ -1,14 +0,0 @@
-nav li {
- @include box-shadow(none);
- @include border-radius(0);
- float: none;
- margin: 0;
- padding: 7px 20px;
- &:last-child {
- border-bottom: 1px solid #444;
-
- }
-}
-
-div.meta { float: none; text-align: center; }
-
View
50 djangocms_admin_style/sass/djangocms-admin.scss
@@ -1,37 +1,21 @@
@import "_settings.scss";
-// partials
-@import "partials/_mixins.scss";
-@import "partials/_base.scss";
-@import "partials/_forms.scss";
-@import "partials/_tables.scss";
-@import "partials/_filer.scss";
-@import "partials/_cmsplaceholders.scss";
-@import "partials/_content.scss";
-@import "partials/_icons.scss";
-
-@import "partials/_shortcuts.scss";
-
-// TODO:
-//@import "partials/_messages.scss";
-
-
-// Media should come last
-//@import "partials/media";
-
-// Layout for pad version
-@media only screen and (max-width: 1024px) {
- @import "devices/_pad.scss";
+@media only screen, print {
+ @import "partials/_mixins.scss";
+ @import "partials/_base.scss";
+ @import "partials/_forms.scss";
+ @import "partials/_tables.scss";
+ @import "partials/_filer.scss";
+ @import "partials/_cmsplaceholders.scss";
+ @import "partials/_content.scss";
+ @import "partials/_icons.scss";
+
+ @import "partials/_shortcuts.scss";
+
+ // TODO:
+ //@import "partials/_messages.scss";
}
-
-// Layout for mobile version
-/*@media handheld, only screen and (max-width: 767px) {
- @import "devices/mobile";
-}
-
-
-// Provide higher res assets for iPhone 4
-@media only screen and (-webkit-min-device-pixel-ratio: 2) {
- @import "devices/retina";
-}*/
+@media only screen and (max-width: 420px), print {
+ @import "partials/_mobile.scss";
+}
View
43 djangocms_admin_style/sass/partials/_content.scss
@@ -222,34 +222,37 @@ a.addlink {
background: white !important; color: $font-color-medium !important; font-weight: normal !important;
border: none !important; margin: 0;
&:hover, &:focus { color: black !important; }
- &.selected { background: $info-color-ultralight !important; color: white !important;
+ &.selected { background: $button-blue-light-color !important; color: white !important;
@include text-shadow(0 1px 1px rgba(0,0,0,0.2)); }
&.notfilled { background: $background-color-light !important; color: $font-color-light !important; }
}
-#lang_tab_content h2.header { background: $info-color-ultralight !important; @include border-top-right-radius();
+#lang_tab_content h2.header { background: $button-blue-light-color !important; @include border-top-right-radius();
margin-bottom: -3px !important; position: relative; }
-// nani language buttons
+// nani/hvad language buttons
.nani-language-tabs {
- border-bottom: 5px solid $info-color-ultralight; margin-bottom: -3px; position: relative;
- span { @include inline-block(); border: none !important; top: 0 !important; color: $font-color-medium !important;
+ border-bottom: 5px solid $button-blue-light-color; margin-bottom: -3px; position: relative;
+ > span {
+ @include inline-block(); border: none !important; top: 0 !important; color: $font-color-medium !important;
font-weight: normal !important; vertical-align: top; background: white; padding: 8px 10px !important;
- margin: 0 !important; @include border-top-radius(); }
- a {
- color: $font-color-medium !important; padding: 5px 10px;
- &:hover, &:focus { color: black !important; text-decoration: none; }
+ margin: 0 !important; @include border-top-radius();
+ a {
+ color: $font-color-medium !important; padding: 5px 10px;
+ &:hover, &:focus { color: black !important; text-decoration: none; }
+ }
+ .deletelink { display: inline; padding: 0 0 0 12px !important; margin: 0; @include border-top-radius(0);
+ background: url('../img/icon_deletelink.png') 0 .25em no-repeat !important; bottom: 0px !important;
+ right: -3px !important; }
}
- .empty { opacity: 1 !important; background: $background-color-light; color: $font-color-light; }
- .current { background: $info-color-ultralight; color: white !important; padding-left: 20px !important;
+ > .empty { opacity: 1 !important; background: $background-color-light; color: $font-color-light; }
+ > .current { background: $button-blue-light-color; color: white !important; padding-left: 20px !important;
padding-right: 20px !important; @include text-shadow(0 1px 1px rgba(0,0,0,0.2)); }
- .deletelink { display: inline; padding: 0 0 0 12px !important; margin: 0; @include border-top-radius(0);
- background: url('../img/icon_deletelink.png') 0 .25em no-repeat !important; bottom: 0px !important;
- right: -3px !important; }
- .current .deletelink { right: -12px !important; }
+ > .current .deletelink { right: -12px !important; }
}
-
-// tinyMCE
-.mceEditor {
- tr { background: none; }
- tr:hover { background: inherit; }
+.inline-group .nani-language-tabs {
+ margin-bottom: 0;
+ > span { padding: 4px 10px !important; }
+ > .current { padding-left: 20px !important; padding-right: 20px !important; }
+ > .available { background: #eee; }
}
+
View
6 djangocms_admin_style/sass/partials/_forms.scss
@@ -10,10 +10,10 @@ form {
}
// input
input, textarea { @include pie; @include border-radius(); border: 1px solid $button-silver-dark-color;
- color: $button-silver-font-color; padding: 6px 5px; outline: none; width: 250px; }
+ color: $button-silver-font-color; padding: 6px 5px; outline: none; }
input[type="checkbox"], input[type="radio"] { border: 0; display: inline; width: auto; margin-right: 6px; }
input[type="file"] { @include pie; @include border-radius(); border: 1px solid $button-silver-dark-color;
- color: $button-silver-font-color; padding: 6px 5px; outline: none; width: 250px; }
+ color: $button-silver-font-color; padding: 6px 5px; outline: none; }
select { font-weight: normal; }
small { margin-left: 15px; }
.form-controls {
@@ -29,6 +29,8 @@ form {
.form-row { border-bottom-color: $line-color-ultralight; }
.form-row:last-child { border-bottom-color: transparent; }
}
+.form-row input, .form-row textarea { width: 250px; }
+.inline-group .form-row input, .inline-group .form-row textarea { width: auto; }
input:valid, textarea:valid {}
View
16 ...in_style/sass/djangocms-admin-mobile.scss → ...ms_admin_style/sass/partials/_mobile.scss
@@ -1,4 +1,4 @@
-@import "_compass.scss";
+@import "../_compass";
// base
html, body { height: auto; }
@@ -89,10 +89,22 @@ body.login {
// cms language buttons
#page_form_lang_tabs input { font-weight: normal !important; font-size: 11px !important; padding: 2px 4px !important; }
+// nani/hvad language buttons
+.nani-language-tabs {
+ > span {
+ font-size: 11px !important; padding: 4px 1px !important;
+ a { padding: 3px 5px !important; }
+ .deletelink { right: 0 !important; }
+ }
+ > .current {
+ padding: 4px 10px 4px 5px !important;
+ .deletelink { right: -8px !important; }
+ }
+}
// forms
form label, .aligned label { display: block; padding: 0 !important; float: none !important;
- line-height: 14px; margin-top: 5px; }
+ line-height: 14px; margin-top: 5px; width: auto; }
form {
input, input[type="file"], textarea, select { width: auto; /*max-width: 200px;*/ }
.vTextField { width: auto; }
View
76 djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin-mobile.css
@@ -1,76 +0,0 @@
-html, body { height: auto; }
-
-#content { margin: 0 5px; }
-
-#container { margin: 0; min-width: 240px !important; }
-
-#branding { display: none; }
-
-.login #branding { display: block; }
-
-#user-tools { position: relative; text-align: center; }
-
-.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; 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; }
-.dashboard #container #content-main { min-width: 0; max-width: none; float: none; }
-.dashboard #container #content-main .addlink, .dashboard #container #content-main .changelink { text-indent: -9999px; overflow: hidden; }
-.dashboard #container #content-related { width: auto; float: none; margin-right: 0; }
-.dashboard #container #content-related .module { padding: 10px !important; margin: 10px 0; }
-.dashboard #container #content-related .module .actionlist { margin-left: 10px; }
-.dashboard .module { background: none !important; }
-
-.change-list #content { margin-top: 38px; }
-.change-list #content > h1 { display: none; }
-.change-list #content .object-tools { margin: -33px 0 0 0; }
-.change-list #toolbar label { display: inline-block; }
-.change-list #toolbar form #searchbar { width: 120px; }
-.change-list #toolbar .small { display: block; }
-.change-list .filtered .results, .change-list .change-list .filtered .paginator, .change-list .filtered #toolbar, .change-list .filtered div.xfull { margin-right: 0 !important; }
-.change-list .module #changelist-form .results { width: 100%; overflow: auto; }
-.change-list .filtered .actions, .change-list .filtered .paginator { margin-right: 0 !important; }
-
-#changelist-filter-button, #changelist-filter { display: none !important; }
-
-.tree { background: white; }
-
-#sitemap li .col-softroot, #sitemap li .col-language, #sitemap li .col-actions, #sitemap li .col-published, #sitemap li .col-navigation, #sitemap li .col-moderator, #sitemap li .col-lastchange, #sitemap li .col-draft, #sitemap li .col-view-perms, #sitemap li .col-creator { display: none !important; }
-
-#sitemap li .col-softroot, #sitemap li .col-language { display: block !important; }
-
-.change-form #content { margin-top: 45px; }
-.change-form #content > h1 { display: none; }
-.change-form .object-tools { margin: -35px 0 0 0; }
-
-#page_form_lang_tabs input { font-weight: normal !important; font-size: 11px !important; padding: 2px 4px !important; }
-
-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 .vTextField { width: auto; }
-form .aligned p, form .aligned ul { padding-left: 0 !important; margin-left: 0 !important; }
-form .submit-row { text-align: left; }
-
-.inline-group { padding: 5px; margin-bottom: 10px; }
-.inline-group .module h2 { padding-left: 5px; }
-
-.selector { width: auto; float: none; }
-.selector .selector-available, .selector .selector-chosen { width: auto; float: none; }
-.selector .selector-available p, .selector .selector-chosen p { text-align: center; }
-.selector .selector-chosen { margin-top: 60px; }
-.selector ul.selector-chooser { margin-top: 0; display: block; }
-.selector select[multiple], .selector select { max-width: none; width: 100%; }
-.selector label { display: inline-block; }
-.selector .selector-available input, .selector .selector-chosen input { width: auto; }
View
670 djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css
333 additions, 337 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1 djangocms_admin_style/templates/admin/base_site.html
@@ -4,7 +4,6 @@
{% block extrastyle %}{% include 'admin/inc/extrastyle.html' %}{% endblock %}
{% block extrahead %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}djangocms_admin_style/css/djangocms-admin.css" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}djangocms_admin_style/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 }}djangocms_admin_style/css/djangocms-admin-frontend.css" />'); }

0 comments on commit a1fa1b1

Please sign in to comment.