Merge pull request #48 from Elthan/master

Updated roleselect CSS
devilry · Jul 27, 2018 · 2790b71 · 2790b71
2 parents 690fea3 + 211e988
commit 2790b71
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,7 +46,6 @@ coverage.xml
 # Django stuff:
 *.log
 *.pot
-**/migrations/
 /staticfiles/
 
 

diff --git a/trix/trix_admin/templates/trix_admin/roleselect.django.html b/trix/trix_admin/templates/trix_admin/roleselect.django.html
@@ -5,7 +5,7 @@
 
 {% block title %}{% trans "Select course" %}{% endblock title %}
 {% block body %}
-    <div class="container" style="margin-top: 20px;">
+    <div class="container trix-roleselect-container" style="margin-top: 20px;">
         <a href="{% url 'trix_student_dashboard' %}">
             <span class="fa fa-arrow-left"></span>
             {% trans "Back to the frontpage" %}
@@ -16,7 +16,7 @@
         {{ block.super }}
     </div>
 
-    <div class="container" style="margin-top: 40px;">
+    <div class="container trix-roleselect-container" style="margin-top: 40px;">
         <h2>{% trans "Documentation" %}</h2>
         <a href="{{ TRIX_ADMIN_DOCUMENTATION_URL }}">{{ TRIX_ADMIN_DOCUMENTATION_LABEL }}</a>
 

diff --git a/trix/trix_core/migrations/0001_initial.pyc b/trix/trix_core/migrations/0001_initial.pyc
diff --git a/trix/trix_core/migrations/__init__.pyc b/trix/trix_core/migrations/__init__.pyc
diff --git a/trix/trix_student/static/trix_student/dist/css/styles.css b/trix/trix_student/static/trix_student/dist/css/styles.css
@@ -8888,14 +8888,22 @@ body {
   text-align: center;
 }
 .trix-roleselect .cradmin-legacy-focusedpage-wrapper {
-  width: 66%;
+  width: 65%;
   margin-top: 40px;
 }
 @media (max-width: 992px) {
   .trix-roleselect .cradmin-legacy-focusedpage-wrapper {
     width: 100%;
   }
 }
+.trix-roleselect-container {
+  width: 66%;
+}
+@media (max-width: 992px) {
+  .trix-roleselect-container {
+    width: 100%;
+  }
+}
 /**
 * Main assignment and permalink pages
 **/

diff --git a/trix/trix_student/static/trix_student/src/less/trix.less b/trix/trix_student/static/trix_student/src/less/trix.less
@@ -20,7 +20,7 @@ body {
 }
 
 .trix-roleselect .cradmin-legacy-focusedpage-wrapper {
-    width: 66%;
+    width: 65%;
     margin-top: 40px;
 }
 
@@ -30,6 +30,16 @@ body {
     }
 }
 
+.trix-roleselect-container {
+    width: 66%;
+}
+
+@media(max-width: 992px) {
+    .trix-roleselect-container {
+        width: 100%;
+    }
+}
+
 /**
 * Main assignment and permalink pages
 **/