Merge pull request #478 from testmycode/better-css

nygrenh · web-flow · commit ec60c6c5940b · 2018-03-15T14:30:07.000+02:00
Better css in points
diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,5 @@ LABEL name tmc-server
 
 ADD Gemfile /app/Gemfile
 ADD Gemfile.lock /app/Gemfile.lock
-RUN bundle install --system
+RUN bundle install --system --gemfile /app/Gemfile
 ADD . /app
-
diff --git a/app/assets/stylesheets/_breadcrumb.scss b/app/assets/stylesheets/_breadcrumb.scss
@@ -1,8 +1,10 @@
+$breadcrumb-grey: #e9ecef;
+
 .breadcumb-nav {
-  background-color: #e9ecef;
+  align-items: center;
+  background-color: $breadcrumb-grey;
   border-radius: 0.25rem;
   display: flex;
-  align-items: center;
   padding-right: 1rem;
 
   .breadcrumb {
diff --git a/app/assets/stylesheets/_footer.scss b/app/assets/stylesheets/_footer.scss
@@ -1,5 +1,7 @@
+$footer-height: 5rem;
+
 .footer {
-  height: 5rem;
+  height: $footer-height;
   background-color: rgb(54, 116, 214);
 }
 
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
@@ -1,4 +1,6 @@
 /* Submissions status*/
+@import "breadcrumb";
+
 .error,
 .failure,
 .fail {
@@ -145,7 +147,10 @@ div.stack-trace {
 }
 
 .scrollable {
+  align-self: center;
+  height: 70vh;
   overflow: auto;
+  width: 95vw;
 }
 
 div.feedback-question {
@@ -166,6 +171,19 @@ form.single-button {
 table {
   border-collapse: collapse;
   width: 100%;
+
+  &.points {
+    min-width: 100%;
+    text-align: center;
+    tbody tr:nth-child(odd) {
+      background-color: lighten($breadcrumb-grey, 4%);
+    }
+  }
+
+  &.points tr.admin * {
+    color: #808080;
+  }
+
 }
 
 table > * > tr > td {
@@ -177,24 +195,20 @@ table > * > tr > th {
   border: 0;
 }
 
-tr.table-totals > td {
-  font-weight: bold;
-}
-
-/* Points tables */
-
-table.points {
-  width: auto;
-}
-
-table.points tr.admin * {
-  color: gray;
+table.points > * > tr > th {
+  text-align: center;
+  max-width: 5rem;
+  word-wrap: break-word;
 }
 
 table.points > * > tr > td {
   text-align: center;
 }
 
+tr.table-totals > td {
+  font-weight: bold;
+}
+
 /* Code reviews */
 
 .code-review {
@@ -460,3 +474,14 @@ td.hljs-ln-code {
   margin-right: 1rem;
   min-width: 200px;
 }
+
+.points-container {
+  align-content: stretch;
+  display: flex;
+  flex-direction: column;
+}
+
+.filter-form input[type="checkbox"],
+ select {
+  margin: 0.2rem;
+}
diff --git a/app/assets/stylesheets/points.scss b/app/assets/stylesheets/points.scss
@@ -1,5 +1,11 @@
+@import "breadcrumb";
+
 .course-point-header {
   display: flex;
-  justify-content: space-between;
   align-items: center;
+  justify-content: space-between;
+}
+
+.point-cell {
+  border: 1px solid darken($breadcrumb-grey, 5%);
 }
diff --git a/app/helpers/extra_field_helper.rb b/app/helpers/extra_field_helper.rb
@@ -65,7 +65,7 @@ def extra_field_checkbox(prefix, field, value)
     return '' if field.field_type == :html
     field_name = prefix + field.name
     field_tag = check_box_tag(field_name, '1', !value.blank?)
-    bs_labeled_field(raw(field.name.humanize), field_tag, order: :label_last)
+    labeled_field(raw(field.name.humanize), field_tag, :order => :label_last, :super_class => "checkbox")
   end
 
   def extra_field_value(value_record)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -29,26 +29,25 @@
   <body class="default">
     <div class="everything-wrapper">
       <%= render partial: 'layouts/navigation' %>
-      <div id="everything">
-        <div class="container container-fluid well-large" id="content-area">
-          <div id="breadcrumb">
-            <div class="row">
-              <div class="col-md-12">
-                <%= render 'twitter-bootstrap/breadcrumbs' %>
+        <div id="everything">
+          <div class="container container-fluid well-large" id="content-area">
+            <div id="breadcrumb">
+              <div class="row">
+                <div class="col-md-12">
+                  <%= render 'twitter-bootstrap/breadcrumbs' %>
+                </div>
               </div>
             </div>
+            <% if @show_page_presence %>
+              <div id="page-presence"></div>
+            <% end %>
+            <%= bootstrap_flash %>
+            <%= yield %>
+            <br>
           </div>
-          <% if @show_page_presence %>
-            <div id="page-presence"></div>
-          <% end %>
-          <%= bootstrap_flash %>
-          <%= yield %>
-          <br>
         </div>
+        <div class="everything-push"></div>
       </div>
-      <div class="everything-push">
-    </div>
-    </div>
     <%= render partial: 'layouts/footer' %>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlightjs-line-numbers.js/2.1.0/highlightjs-line-numbers.min.js" integrity="sha256-ORy35NeVPhp5u86UDEs69WrNPjYJ899tayoT/y0NJ/I=" crossorigin="anonymous"></script>
diff --git a/app/views/participants/index.html.erb b/app/views/participants/index.html.erb
@@ -1,6 +1,6 @@
 <h1>List of participants</h1>
 
-<%= form_tag(participants_path, :method => :get) do %>
+<%= form_tag(participants_path, :method => :get, :class => "filter-form") do %>
   <div style="float: left">
     <%= render :partial => 'participants/filter_controls' %>
   </div>
diff --git a/app/views/points/index.html.erb b/app/views/points/index.html.erb
diff --git a/app/views/points/show.html.erb b/app/views/points/show.html.erb
diff --git a/dev-entry.sh b/dev-entry.sh

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
	`1`	`+$footer-height: 5rem;`
	`2`	`+`
`1`	`3`	`.footer {`
`2`		`- height: 5rem;`
	`4`	`+ height: $footer-height;`
`3`	`5`	`background-color: rgb(54, 116, 214);`
`4`	`6`	`}`
`5`	`7`