diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 805e9820f..e3e3f1f8f 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -322,13 +322,17 @@ a[data-toggle="tooltip"] { @include box-shadow(0 4px 0 $brand-primary); margin-bottom: 4px; - a, - a:hover, - a:focus { - background: $color-white; + & > a, + & > a:hover, + & > a:focus { + background: transparent; color: $color-emperor; font-weight: bold; } + + ul .active-item { + font-weight: bold; + } } } } @@ -500,12 +504,27 @@ a[data-toggle="tooltip"] { } } -.protocols-datatable table { - tbody tr.selected { - & > td:nth-child(3), td:nth-child(4) { - color: $color-emperor; - & a { +.protocols-datatable { + .dataTables_wrapper { + margin-top: 15px; + clear: both; + + .dataTables_length { + float: left; + } + + .dataTables_filter { + float: right; + } + } + + table { + tbody tr.selected { + & > td:nth-child(3), td:nth-child(4) { color: $color-emperor; + & a { + color: $color-emperor; + } } } } @@ -765,50 +784,25 @@ ul.double-line > li { ul.content-activities { li.activity-item { - border-radius: .25em; background-color: $color-white; - border: 1px solid $color-concrete; + border-bottom: 1px solid $color-concrete; + padding: 8px 0; .activity-item-date { min-width: 150px; display: table-cell; - vertical-align: middle; - border-top-left-radius: .25em; - border-bottom-left-radius: .25em; - border: 3px solid $color-alto; - background-color: $color-alto; - padding-left: 10px; - padding-right: 10px; + padding: 0 10px; vertical-align: top; + text-align: center; } .activity-item-text { display: table-cell; - padding: 3px 10px; + padding: 0 10px; text-align: justify; } } } -ul.content-module-activities { - - li.activity-item { - margin-bottom: 15px; - - .activity-item-date { - font-size: 1.2em; - background-color: $color-alto; - border-color: $color-alto; - padding-top: 5px; - padding-bottom: 5px; - } - .activity-item-text { - padding-top: 5px; - padding-bottom: 5px; - } - } - -} - .step { .panel-heading a[data-toggle] { color: inherit; diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index 35788b9ef..6bf1386ee 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -3,7 +3,7 @@
-
    +
      <% if @vars[:activities].empty? %>
    • <%= t'activities.index.no_activities' %>
    • <% else %> diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb index 2af3d1235..f567f8c81 100644 --- a/app/views/experiments/canvas.html.erb +++ b/app/views/experiments/canvas.html.erb @@ -12,7 +12,7 @@ type: 'button', id: 'edit-canvas-button', data: { action: 'edit' }, - class: 'ajax btn btn-default' do %> + class: 'ajax btn btn-primary' do %> <% end %> @@ -41,17 +41,6 @@ <% end %>
- - <% if can_create_experiments?(@project) %> - <%= link_to new_project_experiment_url(@project), - remote: true, - type: "button", - id: 'new-experiment', - class: "btn btn-primary pull-right" do %> - - <%=t 'experiments.new.create' %> - <% end %> - <% end %>
@@ -68,4 +57,3 @@ <%= javascript_include_tag("eventPause-min") %> <%= javascript_include_tag("projects/canvas") %> -<%= javascript_include_tag("experiments/dropdown_actions") %> diff --git a/app/views/my_modules/activities/_list_activities.html.erb b/app/views/my_modules/activities/_list_activities.html.erb index a14ccd8ab..5dc79a456 100644 --- a/app/views/my_modules/activities/_list_activities.html.erb +++ b/app/views/my_modules/activities/_list_activities.html.erb @@ -1,5 +1,5 @@ -