diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss index c37bcfe4..d7992541 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/tracks.css.scss @@ -6,29 +6,16 @@ body { background-color: #DDD; } -div.tracks-middle { +div.tracks-main { background-color: #FFF; - padding: 15px; border-radius: 10px; } /* Header */ -.navbar-inner { - border-radius: none; - div.btn-toolbar { - margin: 0px 15px 0px 0px; - } - input { - width: 100px; - } -} - -div#tracks-login-navbar { - .navbar-inner { - background-color: #000; - background-image: none; - } +div#tracks-login-header { + background-color: #000; + padding: 0; } div#tracks-login-form { @@ -66,10 +53,10 @@ div.todo-item { div.row { margin-left: 0px; } - i.icon-check-empty { + i.fa-square-o { margin-right: 10px; } - i.icon-check-sign { + i.fa-check-square-o { margin-right: 10px; color: #666; } @@ -80,10 +67,10 @@ div.todo-item { span.todo-item-icons { color: #BBB; /* light gray */ cursor: pointer; - i.icon-check-empty { + i.fa-square-o { color: #333; } - i.icon-star { + i.fa-star { color: #F89406; /* orange */ } } @@ -186,16 +173,6 @@ div#project-next-prev { /* Dialogs */ -.modal-body { - overflow-y: visible; -} - -div#tracks-go-item-dialog { - input.input-medium { - width : 95%; - } -} - div.paginate_header { text-align: center; } diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index ee943188..9f7ea0da 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -124,9 +124,9 @@ module TodosHelper end def todo_form_control_group (label_for, label) - content_tag(:div, class: "control-group") do - content_tag(:label, class: "control-label", for: label_for){label} + - content_tag(:div, class:"controls") { yield } + content_tag(:div, class: "form-group") do + content_tag(:label, class: "col-sm-3 control-label", for: label_for){label} + + content_tag(:div, class:"col-sm-9") { yield } end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2d50f9e0..07bb4647 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,13 +33,9 @@ <%= render partial: "shared/navbar" %> <% end -%> -
-
-
- <%= bootstrap_flash %> - <%= yield %> -
-
+
+ <%= render_flash %> + <%= yield %>
<% cache [:footer] do -%> @@ -59,4 +55,4 @@ <%= javascript_include_tag "application" %> - \ No newline at end of file + diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index db0b0b84..40f75091 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -36,21 +36,15 @@ -