[Python-modules-commits] [djangocms-admin-style] 02/08: Import djangocms-admin-style_1.2.2+dfsg.orig.tar.gz
Michael Fladischer
fladi at moszumanska.debian.org
Sun Jun 19 13:50:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository djangocms-admin-style.
commit 95d8a38b936022a52ad4018149efd93e6cb8954e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sun Jun 19 15:11:11 2016 +0200
Import djangocms-admin-style_1.2.2+dfsg.orig.tar.gz
---
PKG-INFO | 2 +-
djangocms_admin_style.egg-info/PKG-INFO | 2 +-
djangocms_admin_style.egg-info/SOURCES.txt | 24 +--
djangocms_admin_style/__init__.py | 2 +-
djangocms_admin_style/sass/components/_base.scss | 21 ++-
.../sass/components/_changelist.scss | 90 ++++-----
.../sass/components/_content.scss | 87 +++++----
.../sass/components/_dashboard.scss | 3 +-
djangocms_admin_style/sass/components/_dialog.scss | 29 +++
djangocms_admin_style/sass/components/_forms.scss | 201 +++++++++++++--------
djangocms_admin_style/sass/components/_header.scss | 2 +-
djangocms_admin_style/sass/components/_icons.scss | 2 +-
djangocms_admin_style/sass/components/_mobile.scss | 89 +++++----
djangocms_admin_style/sass/components/_modal.scss | 36 ++--
.../sass/components/_sideframe.scss | 6 +
djangocms_admin_style/sass/components/_tables.scss | 3 +
.../sass/djangocms-admin-frontend.scss | 11 --
djangocms_admin_style/sass/djangocms-admin.scss | 4 +
djangocms_admin_style/sass/mixins/_all.scss | 1 +
djangocms_admin_style/sass/mixins/_custom.scss | 1 +
djangocms_admin_style/sass/mixins/_zindex.scss | 32 ++++
djangocms_admin_style/sass/settings/_cms.scss | 10 +-
djangocms_admin_style/sass/settings/_custom.scss | 8 -
.../css/djangocms-admin-frontend.css | 1 -
.../djangocms_admin_style/css/djangocms-admin.css | 2 +-
.../{ => djangocms_admin_style}/js/base-admin.js | 6 +
.../js/drag-touch-support.js | 0
.../static/filer/icons/file_32x32.png | Bin 1594 -> 0 bytes
.../static/filer/icons/file_48x48.png | Bin 1739 -> 0 bytes
.../static/filer/icons/nofile_48x48.png | Bin 2132 -> 0 bytes
.../static/filer/icons/plainfolder_128x128.png | Bin 2293 -> 0 bytes
.../static/filer/icons/plainfolder_32x32.png | Bin 1430 -> 0 bytes
.../static/filer/icons/plainfolder_48x48.png | Bin 15628 -> 0 bytes
.../static/filer/icons/unfiled_folder_32x32.png | Bin 2744 -> 0 bytes
.../static/filer/icons/unfiled_folder_48x48.png | Bin 2777 -> 0 bytes
.../static/icons/plainfolder_128x128.png | Bin 2293 -> 0 bytes
.../templates/admin/base_site.html | 8 +-
.../templates/admin/delete_confirmation.html | 5 +-
.../templates/admin/inc/branding.html | 15 +-
39 files changed, 424 insertions(+), 279 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index efaaffd..194e3ed 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: djangocms-admin-style
-Version: 1.1.0
+Version: 1.2.2
Summary: Adds pretty CSS styles for the django CMS admin interface.
Home-page: http://www.django-cms.org/
Author: Ales Kocjancic
diff --git a/djangocms_admin_style.egg-info/PKG-INFO b/djangocms_admin_style.egg-info/PKG-INFO
index efaaffd..194e3ed 100644
--- a/djangocms_admin_style.egg-info/PKG-INFO
+++ b/djangocms_admin_style.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: djangocms-admin-style
-Version: 1.1.0
+Version: 1.2.2
Summary: Adds pretty CSS styles for the django CMS admin interface.
Home-page: http://www.django-cms.org/
Author: Ales Kocjancic
diff --git a/djangocms_admin_style.egg-info/SOURCES.txt b/djangocms_admin_style.egg-info/SOURCES.txt
index 790f3be..0aaec76 100644
--- a/djangocms_admin_style.egg-info/SOURCES.txt
+++ b/djangocms_admin_style.egg-info/SOURCES.txt
@@ -27,7 +27,6 @@ djangocms_admin_style/locale/ru/LC_MESSAGES/django.mo
djangocms_admin_style/locale/ru/LC_MESSAGES/django.po
djangocms_admin_style/locale/uk/LC_MESSAGES/django.mo
djangocms_admin_style/locale/uk/LC_MESSAGES/django.po
-djangocms_admin_style/sass/djangocms-admin-frontend.scss
djangocms_admin_style/sass/djangocms-admin.scss
djangocms_admin_style/sass/ie.scss
djangocms_admin_style/sass/components/_base.scss
@@ -35,6 +34,7 @@ djangocms_admin_style/sass/components/_changelist.scss
djangocms_admin_style/sass/components/_cmsplaceholders.scss
djangocms_admin_style/sass/components/_content.scss
djangocms_admin_style/sass/components/_dashboard.scss
+djangocms_admin_style/sass/components/_dialog.scss
djangocms_admin_style/sass/components/_drag-and-drop.scss
djangocms_admin_style/sass/components/_filer.scss
djangocms_admin_style/sass/components/_footer.scss
@@ -59,6 +59,7 @@ djangocms_admin_style/sass/libs/html5-boilerplate/_reset.scss
djangocms_admin_style/sass/libs/html5-boilerplate/_styles.scss
djangocms_admin_style/sass/mixins/_all.scss
djangocms_admin_style/sass/mixins/_custom.scss
+djangocms_admin_style/sass/mixins/_zindex.scss
djangocms_admin_style/sass/settings/_all.scss
djangocms_admin_style/sass/settings/_cms.scss
djangocms_admin_style/sass/settings/_custom.scss
@@ -78,10 +79,11 @@ djangocms_admin_style/static/admin/img/selector-icons.gif
djangocms_admin_style/static/admin/img/selector-search.gif
djangocms_admin_style/static/cms/PIE.htc
djangocms_admin_style/static/cms/images/sitemap-li-bg.jpg
-djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin-frontend.css
+djangocms_admin_style/static/djangocms_admin_style/.DS_Store
djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css
djangocms_admin_style/static/djangocms_admin_style/css/ie.css
djangocms_admin_style/static/djangocms_admin_style/css/pie.css
+djangocms_admin_style/static/djangocms_admin_style/fonts/.DS_Store
djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.eot
djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.svg
djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.ttf
@@ -91,6 +93,7 @@ djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.eot
djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.svg
djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.ttf
djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-icons.woff
+djangocms_admin_style/static/djangocms_admin_style/fonts/src/.DS_Store
djangocms_admin_style/static/djangocms_admin_style/fonts/src/archive.svg
djangocms_admin_style/static/djangocms_admin_style/fonts/src/arrow-left.svg
djangocms_admin_style/static/djangocms_admin_style/fonts/src/arrow-right.svg
@@ -191,19 +194,10 @@ djangocms_admin_style/static/djangocms_admin_style/img/pluginlist-holder-bg.png
djangocms_admin_style/static/djangocms_admin_style/img/select2.png
djangocms_admin_style/static/djangocms_admin_style/img/sorting-icons.gif
djangocms_admin_style/static/djangocms_admin_style/img/sorting-icons.png
-djangocms_admin_style/static/filer/icons/file_32x32.png
-djangocms_admin_style/static/filer/icons/file_48x48.png
-djangocms_admin_style/static/filer/icons/nofile_48x48.png
-djangocms_admin_style/static/filer/icons/plainfolder_128x128.png
-djangocms_admin_style/static/filer/icons/plainfolder_32x32.png
-djangocms_admin_style/static/filer/icons/plainfolder_48x48.png
-djangocms_admin_style/static/filer/icons/unfiled_folder_32x32.png
-djangocms_admin_style/static/filer/icons/unfiled_folder_48x48.png
-djangocms_admin_style/static/icons/plainfolder_128x128.png
-djangocms_admin_style/static/js/base-admin.js
-djangocms_admin_style/static/js/drag-touch-support.js
-djangocms_admin_style/static/js/jquery.ui.touch-punch.js
-djangocms_admin_style/static/js/jquery.ui.touch-punch.min.js
+djangocms_admin_style/static/djangocms_admin_style/js/.DS_Store
+djangocms_admin_style/static/djangocms_admin_style/js/base-admin.js
+djangocms_admin_style/static/djangocms_admin_style/js/drag-touch-support.js
+djangocms_admin_style/static/djangocms_admin_style/js/jquery.ui.touch-punch.min.js
djangocms_admin_style/static/preview_images/admin-style-1.png
djangocms_admin_style/static/preview_images/admin-style-2.png
djangocms_admin_style/static/preview_images/admin-style-3.png
diff --git a/djangocms_admin_style/__init__.py b/djangocms_admin_style/__init__.py
index 1a72d32..923b987 100644
--- a/djangocms_admin_style/__init__.py
+++ b/djangocms_admin_style/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.2.2'
diff --git a/djangocms_admin_style/sass/components/_base.scss b/djangocms_admin_style/sass/components/_base.scss
index 3b4b7cd..ad37b46 100644
--- a/djangocms_admin_style/sass/components/_base.scss
+++ b/djangocms_admin_style/sass/components/_base.scss
@@ -4,7 +4,7 @@
body {
background-color: $gray-lightest;
h1 {
- margin-left: 0;
+ margin-left: 0 !important;
}
.module {
h2 {
@@ -42,9 +42,9 @@ input::-ms-clear {
h1 {
color: $gray-darkest;
- font-size: $font-size-large;
+ font-size: $font-size-large !important;
font-weight: bold;
- margin: 0 10px 25px;
+ margin: 0 10px 25px !important;
}
h2 {
color: $gray-darkest;
@@ -127,10 +127,12 @@ a:link {
}
// make sure that cancel link has correct height #261
a.button.cancel-link {
+ float: right;
display: inline-block;
- line-height: 32px !important;
- height: 32px !important;
+ line-height: 34px !important;
+ height: 34px !important;
margin-left: 10px;
+ margin-right: 10px;
margin-top: 0;
padding: 0 20px !important
}
@@ -248,6 +250,15 @@ ul.errorlist {
margin-bottom: 10px !important;
background-color: transparent !important;
border: 0 !important;
+ a {
+ &,
+ &:link,
+ &:hover,
+ &:focus,
+ &:visited {
+ color: $gray-darkest;
+ }
+ }
li {
color: $color-danger !important;
font-size: $font-size-normal !important;
diff --git a/djangocms_admin_style/sass/components/_changelist.scss b/djangocms_admin_style/sass/components/_changelist.scss
index f23457c..231fbde 100644
--- a/djangocms_admin_style/sass/components/_changelist.scss
+++ b/djangocms_admin_style/sass/components/_changelist.scss
@@ -6,9 +6,9 @@
#changelist-search,
#changelist form,
#content-related form {
- padding: 0;
- margin-bottom: 0;
margin-top: 0;
+ margin-bottom: 0;
+ padding: 0;
background-color: transparent;
box-shadow: none;
}
@@ -43,9 +43,9 @@
box-shadow: none !important;
}
.paginator {
+ color: $gray-light !important;
// important is needed to make sure that paginator has correct font size #288
font-size: $font-size-small !important;
- color: $gray-light !important;
min-height: 20px;
padding: 5px $paginator-padding !important;
background-color: $white !important;
@@ -68,9 +68,9 @@
overflow-y: auto;
width: $filtered-filter-width !important;
max-height: 585px;
+ margin-left: $filtered-filter-margin;
padding-right: $filtered-filter-padding;
padding-left: 0;
- margin-left: $filtered-filter-margin;
}
.results,
.paginator,
@@ -86,8 +86,8 @@
.paginator {
// calculates correct width because of margin right
width: calc(100% - #{$filter-changelist-margin}) !important;
- box-shadow: $base-box-shadow;
border-right: 0;
+ box-shadow: $base-box-shadow;
}
.actions {
margin-right: $filtered-filter-width !important;
@@ -115,9 +115,9 @@
max-width: 10px;
height: 36px;
margin: 0 21px;
- background: url('../img/drag.png');
- background-size: 5px;
cursor: move !important;
+ background: url("../img/drag.png");
+ background-size: 5px;
}
input[type="checkbox"],
input[type="radio"] {
@@ -129,8 +129,8 @@
overflow: hidden;
height: auto;
min-height: 30px;
- padding: 3px 3px 3px 0;
margin: 0 30px 10px 0 !important;
+ padding: 3px 3px 3px 0;
border: 0 !important;
background: none !important;
form label {
@@ -141,16 +141,16 @@
}
@at-root #toolbar #changelist-search form #searchbar,
form #searchbar {
+ font-size: $font-size-small;
+ vertical-align: middle;
+ box-sizing: border-box;
width: auto !important;
- // django 1.9
- height: 34px !important;
// makes sure that search doesn't jumps to new line #155
max-width: 257px !important;
- font-size: $font-size-small;
+ // django 1.9
+ height: 36px !important;
padding: 9px 5px !important;
border-radius: 3px !important;
- vertical-align: middle;
- box-sizing: border-box;
}
// makes sure that if admin cations are visible that toolbar floats to position next to actions #275, #285
&.actions-visible {
@@ -171,13 +171,13 @@
h2,
h3 {
margin-bottom: 15px !important;
- padding-left: 0 !important;
padding-bottom: 10px !important;
+ padding-left: 0 !important;
border-bottom: solid 1px $gray-lighter;
}
h2 {
- font-size: $font-size-normal !important;
color: $gray;
+ font-size: $font-size-normal !important;
font-weight: normal;
text-transform: uppercase;
padding: 2px 9px;
@@ -190,17 +190,17 @@
}
ul {
font-size: $font-size-small;
- margin-left: 0 !important;
margin-bottom: 10px;
+ margin-left: 0 !important;
}
li {
font-size: $font-size-normal;
margin-bottom: 15px;
&.selected {
font-weight: bold;
- border-left: 0 !important;
- padding-left: 0 !important;
margin-left: 0 !important;
+ padding-left: 0 !important;
+ border-left: 0 !important;
a {
color: $color-primary !important;
}
@@ -216,9 +216,9 @@
white-space: nowrap;
// makes sure that action select doesn't jumps to new line #155
width: 257px !important;
- padding: 9px 40px 9px 20px;
margin-top: 3px;
margin-right: 10px;
+ padding: 6px 40px 6px 20px;
border: 1px solid $gray-lighter;
border-radius: $border-radius-base;
}
@@ -226,34 +226,35 @@
display: inline-block;
// make sure that only icon is displayed
font: 0/0 a;
- margin-left: 0;
margin-bottom: 0;
+ margin-left: 0;
}
button {
font-family: $base-font-family;
font-size: $font-size-small;
vertical-align: bottom;
- height: auto;
- margin-right: 10px;
+ height: 36px;
margin-top: 0;
+ margin-right: 10px;
margin-bottom: 0;
padding: 10px 15px !important;
box-shadow: none;
}
.action-counter {
- display: inline !important;
+ display: inline-block !important;
font-size: $font-size-small;
- margin: 5px 0 0;
+ line-height: 36px;
+ vertical-align: bottom;
}
}
.toplinks {
+ clear: both;
overflow: hidden;
- margin-bottom: 20px !important;
margin-top: 20px !important;
- border-bottom: 0 !important;
+ margin-bottom: 20px !important;
border-top: 0;
+ border-bottom: 0 !important;
background: none;
- clear: both;
li {
display: inline;
float: left;
@@ -268,10 +269,10 @@
}
}
a {
- position: relative;
display: block;
- font-size: $font-size-normal;
+ position: relative;
color: $color-primary;
+ font-size: $font-size-normal;
font-weight: normal;
text-transform: uppercase;
}
@@ -289,9 +290,9 @@
.paginator {
// calculates correct width because of margin left and right
width: calc(100% - 30px);
- box-shadow: $base-box-shadow !important;
border-top: none;
background: none;
+ box-shadow: $base-box-shadow !important;
}
}
#changelist-search {
@@ -302,8 +303,8 @@
margin-left: 10px;
+ label {
display: inline-block !important;
- font-size: $font-size-small !important;
color: $gray-light !important;
+ font-size: $font-size-small !important;
text-transform: none;
}
}
@@ -318,17 +319,17 @@
@include button-variant($btn-action-color, $btn-action-bgcolor, $btn-action-border, true);
vertical-align: middle;
text-indent: -9999px;
- padding: 10px 16px !important;
+ box-sizing: border-box;
margin-left: 10px !important;
- background-image: url('../img/icon_search_white at 2x.png') !important;
+ padding: 10px 16px !important;
+ background-image: url("../img/icon_search_white at 2x.png") !important;
background-repeat: no-repeat !important;
background-position: center !important;
background-size: 20px !important;
- box-sizing: border-box;
// django 1.9
box-shadow: none !important;
&:active {
- background-image: url('../img/icon_search_white at 2x.png') !important;
+ background-image: url("../img/icon_search_white at 2x.png") !important;
}
}
label {
@@ -341,14 +342,14 @@
}
#changelist-filter-button {
color: $gray-light;
- text-transform: uppercase;
font-size: $font-size-normal;
+ text-transform: uppercase;
width: 175px;
margin-bottom: 5px;
padding-left: 25px;
- background: url('../img/icon_arrow_down.png') no-repeat left center;
- background-size: 25px;
border-left: 0;
+ background: url("../img/icon_arrow_down.png") no-repeat left center;
+ background-size: 25px;
+ #changelist-filter {
position: absolute;
top: 30px;
@@ -396,21 +397,20 @@
}
}
.sortoptions {
- float: right;
display: inline-block;
+ float: right;
padding-top: 0;
}
}
}
.paginator {
- box-shadow: none;
background-color: transparent;
+ box-shadow: none;
.this-page {
- font-size: $font-size-small;
color: $gray-light;
+ font-size: $font-size-small;
font-weight: normal;
padding: 0;
-
}
}
}
@@ -420,8 +420,8 @@ a.lang-code {
font-size: $font-size-small !important;
font-weight: bold !important;
text-transform: uppercase;
- padding: 2px 8px !important;
margin-right: 10px !important;
+ padding: 2px 8px !important;
border: solid 1px $gray-lighter;
border-radius: 10px !important;
background-color: $gray-lighter;
@@ -430,16 +430,16 @@ a.lang-code {
}
&.current.active {
color: $color-primary !important;
- background-color: $white !important;
border-color: $color-primary;
+ background-color: $white !important;
&:hover {
color: $color-primary !important;
}
}
&.active {
color: $white !important;
- background-color: $color-primary !important;
border-color: $color-primary;
+ background-color: $color-primary !important;
&:hover {
color: $white !important;
}
diff --git a/djangocms_admin_style/sass/components/_content.scss b/djangocms_admin_style/sass/components/_content.scss
index 7b3284e..decc031 100644
--- a/djangocms_admin_style/sass/components/_content.scss
+++ b/djangocms_admin_style/sass/components/_content.scss
@@ -100,8 +100,8 @@ ul.messagelist + #content {
caption {
color: $gray;
font-size: $font-size-normal !important;
- line-height: $font-size-normal;
font-weight: normal;
+ line-height: $font-size-normal;
text-transform: uppercase;
margin: 0 0 10px 10px;
padding: 0;
@@ -135,16 +135,16 @@ ul.messagelist + #content {
.inline-group h2 {
color: $gray-darkest;
font-size: $font-size-normal;
- line-height: $font-size-normal;
font-weight: normal;
+ line-height: $font-size-normal;
padding-left: 0;
background: none;
}
-.inline-group {
+.djangocms-admin-style .inline-group {
@include box();
+ overflow: auto;
padding: 0;
border: 0;
- overflow: auto;
.module {
padding: 0;
border: none !important;
@@ -190,8 +190,8 @@ ul.messagelist + #content {
background: none !important;
}
a {
- font-size: $font-size-normal !important;
color: $color-success;
+ font-size: $font-size-normal !important;
padding-left: 0 !important;
background: none !important;
&:before {
@@ -203,8 +203,8 @@ ul.messagelist + #content {
#taggit_taggeditem_items-group {
width: 80%;
h2 {
- font-weight: bold;
font-size: $font-size-large;
+ font-weight: bold;
}
h3 {
color: $gray-darkest;
@@ -212,8 +212,8 @@ ul.messagelist + #content {
}
.module {
width: 100%;
- padding: 10px 0;
margin: 0;
+ padding: 10px 0;
border-top: solid 1px $gray-lighter !important;
border-bottom: solid 1px $gray-lighter !important;
}
@@ -235,11 +235,12 @@ ul.messagelist + #content {
h3 {
color: $gray;
font-weight: normal;
- padding: 0;
margin-bottom: 0;
+ padding: 0;
border-bottom: none;
background: none;
- b, span {
+ b,
+ span {
font-size: $font-size-normal;
font-weight: normal;
}
@@ -255,14 +256,14 @@ ul.messagelist + #content {
margin: 0 2px !important;
}
}
-.submit-row {
+.djangocms-admin-style .submit-row {
margin: 10px -25px 0;
- padding: 20px 25px 0 !important;
+ padding: 20px 25px 0;
border: 0;
border-top: 1px solid $gray-lighter;
border-radius: $border-radius-base;
- background: none !important;
- box-shadow: none !important;
+ background: none;
+ box-shadow: none;
.deletelink-box {
margin: 0;
.deletelink {
@@ -300,21 +301,21 @@ ul.messagelist + #content {
padding: 10px 0 !important;
border: 0 !important;
li {
+ white-space: initial;
padding: 0 !important;
border: 0 !important;
- white-space: initial;
}
// make sure that if label breaks to new line that it is aligned #283
label {
- position: relative;
// make sure that link after label doesn't break to new line #287
display: inline-block;
+ position: relative;
line-height: 20px;
padding-left: 20px !important;
input {
- position: absolute;
- top: 4px;
- left: 0;
+ position: relative;
+ top: auto;
+ margin-left: -20px;
}
}
}
@@ -336,8 +337,9 @@ ul.messagelist + #content {
img {
position: absolute;
right: 0;
- order: 2;
margin: 5px 0;
+
+ order: 2;
}
}
}
@@ -345,16 +347,16 @@ ul.messagelist + #content {
width: 100%;
.selector-available,
.selector-chosen {
+ box-sizing: border-box;
width: calc(47.5% - 5px);
padding: 0 10px 10px;
- background-color: $white;
border: 1px solid $gray-lighter;
border-radius: $border-radius-base;
- box-sizing: border-box;
+ background-color: $white;
h2 {
color: $gray !important;
- font-weight: normal;
font-size: $font-size-normal !important;
+ font-weight: normal;
line-height: $line-height-normal;
text-transform: uppercase;
margin-bottom: 5px;
@@ -411,6 +413,7 @@ ul.messagelist + #content {
}
}
.selector-filter {
+ padding-right: 0;
padding-left: 0;
border: none;
label {
@@ -424,18 +427,18 @@ ul.messagelist + #content {
select[multiple] {
overflow-y: auto;
width: 100% !important;
- padding: 0;
margin-bottom: 5px;
+ padding: 0;
border: 1px solid $gray-lighter !important;
// hides dropdown icon which is generally added to select fields #216
background: none !important;
option {
font-size: $font-size-normal;
line-height: $line-height-normal;
+ white-space: normal;
width: 100%;
padding: 10px;
border-bottom: solid 1px $gray-lighter;
- white-space: normal;
}
}
a {
@@ -448,9 +451,9 @@ ul.messagelist + #content {
width: 5% !important;
margin: 10em 5px 0 5px !important;
border: 0;
- background-color: transparent;
// hides background image because of icon font replacement #216
background: none;
+ background-color: transparent;
li {
text-align: center;
padding: 3px;
@@ -482,17 +485,17 @@ a.addlink {
.addlink {
@include button-variant($btn-action-color, $btn-action-bgcolor, $btn-action-border, true);
font-weight: normal;
- padding: 6px 20px !important;
height: auto !important;
+ padding: 6px 20px !important;
}
.recoverlink {
color: $color-primary !important;
font-weight: normal;
text-decoration: underline;
padding: 9px 0 !important;
- background-color: transparent !important;
- border-radius: 0 !important;
border: 0 !important;
+ border-radius: 0 !important;
+ background-color: transparent !important;
&:hover,
&:active,
&:focus {
@@ -517,8 +520,8 @@ a.addlink {
margin-top: -54px;
margin-left: 0;
li {
- float: none;
display: inline-block;
+ float: none;
height: auto;
margin-left: 10px;
list-style: none;
@@ -529,8 +532,8 @@ a.addlink {
> a {
@include button-variant($btn-default-color, $btn-default-bgcolor, $btn-default-border, true);
line-height: inherit !important;
- margin-right: 0 !important;
height: auto !important;
+ margin-right: 0 !important;
}
}
.addlink {
@@ -564,14 +567,14 @@ a.addlink {
// delete page
.delete-confirmation .colM {
- &#content {
- padding: 25px !important;
- }
@include box();
margin: 15px !important;
padding: 25px !important;
- box-shadow: $base-box-shadow;
background-color: $white;
+ box-shadow: $base-box-shadow;
+ &#content {
+ padding: 25px !important;
+ }
ul {
margin-top: 10px;
}
@@ -591,7 +594,7 @@ a.addlink {
input[type="submit"] {
@include button-variant($btn-action-color, $btn-action-bgcolor, $btn-action-border, true);
float: right;
- line-height: 20px;
+ line-height: 22px;
}
form {
padding: 0 !important;
@@ -623,9 +626,9 @@ a.addlink {
#page_form_lang_tabs input,
.parler-language-tabs span {
color: $gray-darkest !important;
- font-weight: normal !important;
- text-transform: uppercase;
font-size: $font-size-normal !important;
+ font-weight: normal !important;
+ text-transform: uppercase !important;
margin: 0;
padding: 10px 20px !important;
border: none !important;
@@ -642,8 +645,8 @@ a.addlink {
&.selected,
&.current {
color: $color-primary !important;
- background: transparent !important;
border-bottom: solid 3px $color-primary !important;
+ background: transparent !important;
}
&.notfilled {
color: $gray !important;
@@ -651,8 +654,8 @@ a.addlink {
&:hover,
&:focus {
color: black !important;
- background-color: $white !important;
border-bottom: solid 3px $white !important;
+ background-color: $white !important;
}
}
a {
@@ -708,6 +711,7 @@ a.addlink {
bottom: 0 !important;
margin: 0;
padding: 0 0 0 12px !important;
+
border-top-radius: 0;
}
}
@@ -740,3 +744,8 @@ a.addlink {
background: $gray-lighter;
}
}
+
+// CKEditor max-size fix #310
+.cke_maximized {
+ z-index: z(ckmaximized);
+}
diff --git a/djangocms_admin_style/sass/components/_dashboard.scss b/djangocms_admin_style/sass/components/_dashboard.scss
index 9717c61..dabc1dd 100644
--- a/djangocms_admin_style/sass/components/_dashboard.scss
+++ b/djangocms_admin_style/sass/components/_dashboard.scss
@@ -5,7 +5,7 @@ body.dashboard {
background-color: $white;
h1 {
// make sure that title is aligned with categories
- margin-left: 10px;
+ margin-left: 10px !important;
}
.breadcrumbs {
padding: $breadcrumb-padding 10px !important;
@@ -73,7 +73,6 @@ body.dashboard {
margin: 0;
border-left: 1px solid $gray-lighter;
background-color: $gray-lightest;
- z-index: -1;
.module {
margin-left: 0;
padding: 0 30px 10px !important;
diff --git a/djangocms_admin_style/sass/components/_dialog.scss b/djangocms_admin_style/sass/components/_dialog.scss
new file mode 100644
index 0000000..d81684d
--- /dev/null
+++ b/djangocms_admin_style/sass/components/_dialog.scss
@@ -0,0 +1,29 @@
+// resets form and background styles in dialog window #186
+// fixes missing border under copy permissions text & paddings/margins of the buttons #335
+
+.cms-dialog {
+ background-color: $white;
+ form {
+ background: none;
+ box-shadow: none;
+ p {
+ margin: 0 20px;
+ padding: $padding-normal 0 !important;
+ &:after {
+ content: "";
+ position: absolute;
+ left: 0;
+ width: 100%;
+ height: 30px;
+ border-bottom: 1px solid $gray-lighter;
+ }
+ }
+ }
+ .submit-row {
+ margin: 10px -20px 0;
+ padding: 20px 20px 0px;
+ input {
+ margin-left: 0;
+ }
+ }
+}
diff --git a/djangocms_admin_style/sass/components/_forms.scss b/djangocms_admin_style/sass/components/_forms.scss
index 6742be2..2c2a885 100644
--- a/djangocms_admin_style/sass/components/_forms.scss
+++ b/djangocms_admin_style/sass/components/_forms.scss
@@ -2,8 +2,8 @@
// FORMS
form {
- padding: 25px 25px;
margin-bottom: 20px;
+ padding: 25px 25px;
background-color: $white;
box-shadow: $base-box-shadow;
fieldset {
@@ -26,8 +26,8 @@ form {
min-height: inherit !important;
}
&.field-get_attachment_address a {
- position: relative;
display: block;
+ position: relative;
font-size: $font-size-large;
line-height: $font-size-large;
margin: 10px 0;
@@ -59,7 +59,6 @@ form {
}
}
&.field-folder {
-
// hides related widget wrapper links because they don't work correctly and are not necessary because
// of magnifier and delete link #224
.related-widget-wrapper-link {
@@ -127,21 +126,13 @@ form {
&.field-thumbnail {
margin: 0;
}
- .field-box {
- float: none;
- margin-top: 20px;
- margin-right: 0 !important;
- &:first-child {
- margin-top: 0;
- }
- }
.related-lookup {
- float: none;
display: inline-block;
- vertical-align: top;
+ float: none;
text-align: center;
- padding: 9px !important;
+ vertical-align: top;
margin: 0 0 0 10px !important;
+ padding: 9px !important;
&:before {
margin: 0 !important;
}
@@ -165,9 +156,15 @@ form {
width: 100% !important;
max-width: none !important;
border-radius: 3px !important;
- appearance: none;
// resets background color for input fields for dark system #271
background-color: $white;
+
+ appearance: none;
+ }
+ input.vDateField,
+ input.vTimeField {
+ // caluclates width pf input field and removes date and calendar pickers to make sure that they floats next to input #319
+ width: calc(100% - 112px) !important;
}
select::-ms-expand {
display: none;
@@ -180,16 +177,16 @@ form {
}
.aligned {
.field-number_of_visits p {
- padding-left: 0;
margin-left: 0;
+ padding-left: 0;
}
p.help {
- font-size: $font-size-small !important;
+ clear: both;
color: $gray;
+ font-size: $font-size-small !important;
margin-top: 10px !important;
- padding: 0 !important;
margin-left: 0;
- clear: both;
+ padding: 0 !important;
}
label {
padding: 0 !important;
@@ -201,9 +198,9 @@ form {
.vCheckboxLabel,
.field-type label,
.sortedm2m label {
- vertical-align: bottom;
color: $gray-darker !important;
font-size: $font-size-large !important;
+ vertical-align: bottom;
text-transform: none;
margin-bottom: 0;
+ a {
@@ -212,8 +209,8 @@ form {
}
}
.field-type label {
- margin-left: 2px !important;
... 993 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangocms-admin-style.git
More information about the Python-modules-commits
mailing list