fixes #3287: minor styling fixes on main.

diff --git a/catalogue/static/catalogue/css/section_list.css b/catalogue/static/catalogue/css/section_list.css
index 1a45397..bd68dee 100644 (file)
--- a/catalogue/static/catalogue/css/section_list.css
+++ b/catalogue/static/catalogue/css/section_list.css
@@ -1,5 +1,5 @@
 #level-chooser-place {
 #level-chooser-place {

-  min-height: 4em;
+  min-height: 5.9375em;

   margin-top: 2em; }
   #level-chooser-place ul#level-chooser {
     margin: 0;
   margin-top: 2em; }
   #level-chooser-place ul#level-chooser {
     margin: 0;


@@ -13,13 +13,13 @@
     #level-chooser-place ul#level-chooser .home {
       display: none;
       position: absolute;
     #level-chooser-place ul#level-chooser .home {
       display: none;
       position: absolute;

-      top: .5em;
+      top: 1.5em;

       left: 0; }
       #level-chooser-place ul#level-chooser .home a {
         background: none;
         padding: 0; }
         #level-chooser-place ul#level-chooser .home a img {
       left: 0; }
       #level-chooser-place ul#level-chooser .home a {
         background: none;
         padding: 0; }
         #level-chooser-place ul#level-chooser .home a img {

-          width: 6.25em; }
+          width: 7.5em; }

     #level-chooser-place ul#level-chooser.fixed {
       position: fixed;
       top: 0;
     #level-chooser-place ul#level-chooser.fixed {
       position: fixed;
       top: 0;


@@ -28,11 +28,15 @@
         display: block; }
     #level-chooser-place ul#level-chooser li {
       display: inline-block;
         display: block; }
     #level-chooser-place ul#level-chooser li {
       display: inline-block;

-      list-style: none; }
+      list-style: none;
+      max-width: 175px; }

       #level-chooser-place ul#level-chooser li a {
       #level-chooser-place ul#level-chooser li a {

+        display: table-cell;

         padding: .5em 1em;
         border-radius: 0.3125em;
         padding: .5em 1em;
         border-radius: 0.3125em;

-        background: #eee; }
+        background: #eee;
+        height: 2.625em;
+        vertical-align: middle; }

         #level-chooser-place ul#level-chooser li a.active {
           color: white;
           background: #ED7831; }
         #level-chooser-place ul#level-chooser li a.active {
           color: white;
           background: #ED7831; }

diff --git a/catalogue/static/catalogue/css/section_list.scss b/catalogue/static/catalogue/css/section_list.scss
index 192e5b6..fda2be3 100755 (executable)
--- a/catalogue/static/catalogue/css/section_list.scss
+++ b/catalogue/static/catalogue/css/section_list.scss
@@ -1,12 +1,12 @@
 $px: 0.0625em;
 
 #level-chooser-place {
 $px: 0.0625em;
 
 #level-chooser-place {

-    min-height: 4em;
+    min-height: 95*$px;

     margin-top: 2em;
 
     ul#level-chooser {
         margin: 0;
     margin-top: 2em;
 
     ul#level-chooser {
         margin: 0;

-        padding: 1em 0 1em 140*$px;
+        padding: 16*$px 0 16*$px 140*$px;

         background-color: white;
         width: 500*$px;
         z-index: 300;
         background-color: white;
         width: 500*$px;
         z-index: 300;


@@ -17,14 +17,14 @@ $px: 0.0625em;
         .home {
             display: none;
             position: absolute;
         .home {
             display: none;
             position: absolute;

-            top: .5em;
+            top: 1.5em;

             left: 0;
 
             a {
                 background: none;
                 padding: 0;
                 img {
             left: 0;
 
             a {
                 background: none;
                 padding: 0;
                 img {

-                    width: 100*$px;
+                    width: 120*$px;

                 }
             }
         }
                 }
             }
         }


@@ -42,11 +42,15 @@ $px: 0.0625em;
         li {
             display: inline-block;
             list-style: none;
         li {
             display: inline-block;
             list-style: none;

+            max-width: 175px;

 
             a {
 
             a {

+                display: table-cell;

                 padding: .5em 1em;
                 border-radius: 5*$px;
                 background: #eee;
                 padding: .5em 1em;
                 border-radius: 5*$px;
                 background: #eee;

+                height: 42*$px;
+                vertical-align: middle;

 
                 &.active {
                     color: white;
 
                 &.active {
                     color: white;

diff --git a/curriculum/templates/curriculum/snippets/course_boxes_toc.html b/curriculum/templates/curriculum/snippets/course_boxes_toc.html
index a2000b7..0c22785 100755 (executable)
--- a/curriculum/templates/curriculum/snippets/course_boxes_toc.html
+++ b/curriculum/templates/curriculum/snippets/course_boxes_toc.html
@@ -6,7 +6,7 @@
             <li><a href="{{ lessons_url }}#{{ level.slug }}_{{ course.slug }}">
             {% if accusative %}
                 {{ course.accusative }}{% else %}
             <li><a href="{{ lessons_url }}#{{ level.slug }}_{{ course.slug }}">
             {% if accusative %}
                 {{ course.accusative }}{% else %}

-                {{ course|lower }}{% endif %}</a>{% if not forloop.last %}, {% else %}.{% endif %}
+                {{ course|lower }}{% endif %}</a>

                 </li>
         {% endfor %}
 </ul>
                 </li>
         {% endfor %}
 </ul>

diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py
index 40e38c3..f2924eb 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -9,7 +9,7 @@ STATICFILES_FINDERS = (
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 

-STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'

 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 PIPELINE_CSS = {
 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 PIPELINE_CSS = {


@@ -64,5 +64,3 @@ PIPELINE_JS = {
 PIPELINE_COMPILERS = (
   'pipeline.compilers.sass.SASSCompiler',
 )
 PIPELINE_COMPILERS = (
   'pipeline.compilers.sass.SASSCompiler',
 )

-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'

diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css
index ffb78d9..d720f44 100644 (file)
--- a/edumed/static/css/main.css
+++ b/edumed/static/css/main.css
@@ -62,7 +62,7 @@
           vertical-align: middle;
           border: 1px solid transparent;
           border-radius: 0.625em;
           vertical-align: middle;
           border: 1px solid transparent;
           border-radius: 0.625em;

-          padding-left: 1em; }
+          padding: 0 1em; }

           #main-sections ul li a .in-box .name {
             display: block;
             font-size: 1.5em;
           #main-sections ul li a .in-box .name {
             display: block;
             font-size: 1.5em;

diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss
index 54b2d35..962336e 100755 (executable)
--- a/edumed/static/css/main.scss
+++ b/edumed/static/css/main.scss
@@ -80,7 +80,7 @@ $px: .0625em;
                     vertical-align: middle;
                     border: 1px solid transparent;
                     border-radius: 10*$px;
                     vertical-align: middle;
                     border: 1px solid transparent;
                     border-radius: 10*$px;

-                    padding-left: 16*$px;
+                    padding: 0 16*$px;

 
                     .name {
                         display: block;
 
                     .name {
                         display: block;

diff --git a/requirements.txt b/requirements.txt
index 50b0286..67f9ab9 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 
 Django>=1.6,<1.7
 South>=0.7.4
 
 Django>=1.6,<1.7
 South>=0.7.4

-django-pipeline>=1.2,<1.3
+django-pipeline>=1.3,<1.4

 python-memcached
 django-piwik
 #pyScss
 python-memcached
 django-piwik
 #pyScss


@@ -12,7 +12,7 @@ django-piwik
 jsonfield>=0.9,<0.10
 
 django_cas>=2.1,<2.2
 jsonfield>=0.9,<0.10
 
 django_cas>=2.1,<2.2

-fnpdjango>=0.1.14,<0.2
+fnpdjango>=0.1.16,<0.2

 
 Feedparser
 
 
 Feedparser