Permalink
Browse files

moved static to own folder and added more retina icons

  • Loading branch information...
1 parent e4af25c commit acc6720b1f768d6bb1de82a6c4f8396a495c24d6 @alesdotio alesdotio committed Nov 19, 2012
Showing with 142 additions and 23 deletions.
  1. +1 −1 README.rst
  2. +1 −1 djangocms_admin_style/sass/partials/_base.scss
  3. +2 −2 djangocms_admin_style/sass/partials/_content.scss
  4. +20 −6 djangocms_admin_style/sass/partials/_icons.scss
  5. +92 −0 djangocms_admin_style/sass/partials/_iconsOLD.scss
  6. +1 −1 djangocms_admin_style/sass/partials/_messages.scss
  7. BIN djangocms_admin_style/static/admin/img/icon_searchbox.png
  8. BIN djangocms_admin_style/static/admin/img/selector-search.gif
  9. 0 djangocms_admin_style/static/{cms → djangocms_admin_style}/PIE.htc
  10. 0 djangocms_admin_style/static/{cms → djangocms_admin_style}/css/djangocms-admin-frontend.css
  11. 0 djangocms_admin_style/static/{cms → djangocms_admin_style}/css/djangocms-admin-mobile.css
  12. +22 −9 djangocms_admin_style/static/{cms → djangocms_admin_style}/css/djangocms-admin.css
  13. 0 djangocms_admin_style/static/{cms → djangocms_admin_style}/css/ie.css
  14. 0 djangocms_admin_style/static/{cms → djangocms_admin_style}/css/pie.css
  15. BIN djangocms_admin_style/static/{cms → djangocms_admin_style}/fonts/django-admin-icons.eot
  16. 0 djangocms_admin_style/static/{cms → djangocms_admin_style}/fonts/django-admin-icons.svg
  17. BIN djangocms_admin_style/static/{cms → djangocms_admin_style}/fonts/django-admin-icons.ttf
  18. BIN djangocms_admin_style/static/{cms → djangocms_admin_style}/fonts/django-admin-icons.woff
  19. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/bg-pattern-light.jpg
  20. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/bg-pattern.jpg
  21. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_addlink@2x.gif
  22. BIN ...yle/static/{cms/images/icon_deletelink@2x.gif → djangocms_admin_style/img/icon_addlink_large.gif}
  23. BIN djangocms_admin_style/static/djangocms_admin_style/img/icon_addlink_large@2x.gif
  24. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_calendar@2x.gif
  25. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_changelink@2x.gif
  26. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_changelink_white.png
  27. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_changelink_white@2x.png
  28. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_clock@2x.gif
  29. BIN djangocms_admin_style/static/djangocms_admin_style/img/icon_deletelink.png
  30. BIN djangocms_admin_style/static/djangocms_admin_style/img/icon_deletelink@2x.png
  31. BIN djangocms_admin_style/static/djangocms_admin_style/img/icon_searchbox@2x.png
  32. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_softroot.png
  33. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/icon_softroot@2x.png
  34. BIN djangocms_admin_style/static/{cms/images → djangocms_admin_style/img}/pluginlist-holder-bg.gif
  35. +3 −3 djangocms_admin_style/templates/admin/base_site.html
View
@@ -25,7 +25,7 @@ Compiling CSS
::
- sass --watch djangocms_admin_style/sass/:djangocms_admin_style/static/cms/css/ --style compact
+ sass --watch djangocms_admin_style/sass/:djangocms_admin_style/static/djangocms_admin_style/css/ --style compact
* If you keep getting this http://stackoverflow.com/questions/8723475/compass-add-compact-to-css-files try using something like ScoutApp.
@@ -1,6 +1,6 @@
// base
-body { background: url('../images/bg-pattern-light.jpg') $background-color-ultralight repeat !important; }
+body { background: url('../img/bg-pattern-light.jpg') #efefef repeat !important; }
body, select, input, textarea { color: $font-color; }
@@ -70,7 +70,7 @@
// login
body.login {
- background: $background-color-ultralight url('../images/bg-pattern.jpg') repeat !important;
+ background: $background-color-ultralight url('../img/bg-pattern.jpg') repeat !important;
#container {
@include box(); border: none; width: 340px !important;
@include box-shadow(rgba(0, 0, 0, 0.3) 0px 1px 2px, #fff 0px 1px 1px inset);
@@ -241,7 +241,7 @@ a.addlink {
.current { background: $info-color-ultralight; 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('../../admin/img/icon_deletelink.gif') 0 .25em no-repeat !important; bottom: 0px !important;
+ background: url('../img/icon_deletelink.png') 0 .25em no-repeat !important; bottom: 0px !important;
right: -3px !important; }
.current .deletelink { right: -12px !important; }
}
@@ -1,18 +1,32 @@
.addlink, .changelink, .deletelink { padding-left: 15px; }
-.tree .changelink { background-image: url('../images/icon_changelink_white.png'); }
+.deletelink { background-image: url('../img/icon_deletelink.png'); }
-#sitemap li .col-softroot span.icon { background: url('../images/icon_softroot.png') 0 0 no-repeat;
+.related-lookup, .add-another {
+ margin: 0 5px;
+ &:hover, &:focus, &:active { text-decoration: none !important; }
+}
+.add-another { @include hide-text(); @include inline-block(); width: 14px; height: 14px;
+ background: url('../img/icon_addlink_large.gif') 0 0 no-repeat; }
+
+.tree .changelink { background-image: url('../img/icon_changelink_white.png'); }
+
+#sitemap li .col-softroot span.icon { background: url('../img/icon_softroot.png') 0 0 no-repeat;
width: 15px; height: 15px; margin: 7px 5px 0 0; }
// retina
@media only screen and (-webkit-min-device-pixel-ratio:2),
only screen and (-o-min-device-pixel-ratio:2),
only screen and (min--moz-device-pixel-ratio:2),
only screen and (min-device-pixel-ratio:2) {
- .addlink { background-image: url('../images/icon_addlink@2x.gif'); background-size: 11px; }
- .changelink { background-image: url('../images/icon_changelink@2x.gif'); background-size: 11px; }
- .tree .changelink { background-image: url('../images/icon_changelink_white@2x.png'); background-size: 11px; }
- .deletelink { background-image: url('../images/icon_deletelink@2x.gif'); background-size: 11px; }
+ .addlink { background-image: url('../img/icon_addlink@2x.gif'); background-size: 11px; }
+ .changelink { background-image: url('../img/icon_changelink@2x.gif'); background-size: 11px; }
+ .tree .changelink { background-image: url('../img/icon_changelink_white@2x.png'); background-size: 11px; }
+ .deletelink { background-image: url('../img/icon_deletelink@2x.png'); background-size: 11px; }
+ #sitemap li .col-softroot span.icon { background-image: url('../img/icon_softroot@2x.png'); background-size: 15px; }
+ .related-lookup { @include hide-text(); @include inline-block(); width: 16px; height: 16px;
+ background: url('../img/icon_searchbox@2x.png') 0 0 no-repeat; background-size: 16px; }
+ .add-another { @include hide-text(); @include inline-block(); width: 14px; height: 14px;
+ background: url('../img/icon_addlink_large@2x.gif') 0 0 no-repeat; background-size: 14px; }
}
@@ -0,0 +1,92 @@
+/* Use the following CSS code if you want to have a class per icon */
+.addlink,
+.changelink,
+#changelist-search label,
+.deletelink,
+a.selector-clearall,
+a.active.selector-clearall,
+a.selector-chooseall,
+a.active.selector-chooseall,
+.selector-remove,
+.selector-add,
+.inline-group .add-row a,
+a[id^="calendarlink"],
+a[id^="clocklink"]
+{
+ background: none !important;
+ padding-left: 10px;
+ line-height: 10px;
+ &:hover {
+ text-decoration: none !important;
+ }
+
+}
+
+.addlink:before,
+.changelink:before,
+#changelist-search label:before,
+.deletelink:before,
+a.selector-clearall:before,
+a.active.selector-clearall:before,
+a.selector-chooseall:before,
+a.active.selector-chooseall:before,
+.selector-remove:before,
+.selector-add:before,
+.inline-group .add-row a:before,
+.add-another:before,
+a[id^="calendarlink"]:before,
+a[id^="clocklink"]:before
+{
+ font-family: 'django-admin-icons';
+ font-style: normal;
+ speak: none;
+ font-weight: normal;
+ font-size: 75%;
+ -webkit-font-smoothing: antialiased;
+ padding-right: 5px;
+}
+
+
+.addlink:before { content: "\22"; }
+.changelink:before { content: "\21"; }
+#changelist-search label:before { content: "\23"; }
+.deletelink:before { content: "\24"; }
+.selector-remove:before, a.selector-clearall:before, a.active.selector-clearall:before { content: "\25"; font-size: 100%; }
+.selector-add:before, a.selector-chooseall:before, a.active.selector-chooseall:before { content: "\26"; font-size: 100%; }
+.inline-group .add-row a:before { content: "\22"; }
+.add-another:before { content: "\22"; }
+a[id^="calendarlink"]:before { content: "\2c"; }
+a[id^="clocklink"]:before { content: "\2d"; }
+
+.actionlist {
+ .addlink, .changelink { padding-left: 0; }
+}
+
+#changelist-search label { font-weight: bold; }
+#changelist-search label img { display: none;}
+.help-tooltip { display: none; }
+a.active.selector-chooseall { }
+.selector-remove, .selector-add { display: inline !important; font-size: 125% !important; padding-left: 1px; color: $font-color-white !important; }
+.selector-remove:before, .selector-add:before { color: $font-color; }
+.inline-group .add-row a { color: $success-color !important; padding-left: 5px !important; }
+
+.add-another {
+ margin-left: 10px;
+ &:hover, &:link:hover {
+ text-decoration: none;
+ }
+}
+.add-another img { display: none; }
+
+
+a[id^="calendarlink"], a[id^="clocklink"] {
+ display: inline-block;
+ font-size: 19px;
+ height: 19px;
+ width: 19px;
+ padding-left: 0 !important;
+}
+a[id^="calendarlink"] img, , a[id^="clocklink"] img { display: none;}
+
+/* Sepcials */
+.selector ul.selector-chooser { @include border-radius(10px); background: $background-color-light !important; height: 44px !important; }
@@ -213,7 +213,7 @@ header {
}
}
.close {
- background: url(../images/sprite.png) no-repeat 0 -100px;
+ background: url(../img/sprite.png) no-repeat 0 -100px;
display: inline-block;
height: 16px;
width: 16px;
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -3,11 +3,11 @@
{% block extrastyle %}{% include 'admin/inc/extrastyle.html' %}{% endblock %}
-{% 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)" />
+{% 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 }}cms/css/djangocms-admin-frontend.css" />'); }
+if (window.self!==window.top) { document.write('<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}djangocms_admin_style/css/djangocms-admin-frontend.css" />'); }
</script>
{% include 'admin/inc/extrahead.html' %}{% endblock %}

0 comments on commit acc6720

Please sign in to comment.