Commit b05a31d9 authored by Bryce Johnson's avatar Bryce Johnson

Fix collapsed icon display and other scss.

parent 15978b8d
//= require vue //= require vue
//= lib/utils/pretty_time //= require lib/utils/pretty_time
(() => { (() => {
const PrettyTime = gl.PrettyTime; const PrettyTime = gl.PrettyTime;
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
} }
}, },
template: ` template: `
<div class='time-tracking-component-wrap' v-cloak> <div class='time_tracker time-tracking-component-wrap' v-cloak>
<div class='sidebar-collapsed-icon'> <div class='sidebar-collapsed-icon'>
<slot name='stopwatch'></slot> <slot name='stopwatch'></slot>
<div class='time-tracking-collapsed-summary'> <div class='time-tracking-collapsed-summary'>
......
...@@ -92,6 +92,7 @@ $dark-background-color: #f5f5f5; ...@@ -92,6 +92,7 @@ $dark-background-color: #f5f5f5;
$table-text-gray: #8f8f8f; $table-text-gray: #8f8f8f;
$widget-expand-item: #e8f2f7; $widget-expand-item: #e8f2f7;
$widget-inner-border: #eef0f2; $widget-inner-border: #eef0f2;
$sidebar-collapsed-icon-color: #999;
/* /*
* Text * Text
......
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
padding-bottom: 10px; padding-bottom: 10px;
color: #999; color: $sidebar-collapsed-icon-color;
span { span {
display: block; display: block;
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
} }
i { i {
color: #999; color: $sidebar-collapsed-icon-color;
} }
} }
} }
...@@ -412,15 +412,17 @@ ...@@ -412,15 +412,17 @@
padding-bottom: 0; padding-bottom: 0;
border-bottom: 0; border-bottom: 0;
.sidebar-collapsed-icon {
> .stopwatch-svg { > .stopwatch-svg {
display: none; display: inline-block;
} }
.sidebar-collapsed-icon {
svg { svg {
width: 16px; width: 16px;
height: 16px; height: 16px;
fill: #999; fill: $sidebar-collapsed-icon-color;
} }
} }
......
...@@ -73,15 +73,15 @@ ...@@ -73,15 +73,15 @@
= f.hidden_field 'milestone_id', value: issuable.milestone_id, id: nil = f.hidden_field 'milestone_id', value: issuable.milestone_id, id: nil
= dropdown_tag('Milestone', options: { title: 'Assign milestone', toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: 'Search milestones', data: { show_no: true, field_name: "#{issuable.to_ability_name}[milestone_id]", project_id: @project.id, issuable_id: issuable.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), use_id: true }}) = dropdown_tag('Milestone', options: { title: 'Assign milestone', toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: 'Search milestones', data: { show_no: true, field_name: "#{issuable.to_ability_name}[milestone_id]", project_id: @project.id, issuable_id: issuable.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), use_id: true }})
- if issuable.has_attribute?(:time_estimate) - if issuable.has_attribute?(:time_estimate)
#issuable-time-tracker.block.time_tracker #issuable-time-tracker.block
%issuable-time-tracker{ ':time_estimate' => 'issuable.time_estimate', ':time_spent' => 'issuable.total_time_spent', ':human_time_estimate' => 'issuable.human_time_estimate', ':human_time_spent' => 'issuable.human_total_time_spent' } %issuable-time-tracker{ ':time_estimate' => 'issuable.time_estimate', ':time_spent' => 'issuable.total_time_spent', ':human_time_estimate' => 'issuable.human_time_estimate', ':human_time_spent' => 'issuable.human_total_time_spent' }
// Fallback while content is loading // Fallback while content is loading
.title.hide-collapsed .title.hide-collapsed
Time tracking Time tracking
= icon('spinner spin') = icon('spinner spin')
// TODO: Remove this when we have webpack/svg solution implemented // TODO: Remove this when we have webpack/svg solution implemented
.hide
.stopwatch-svg{ slot:'stopwatch' } .stopwatch-svg{ slot:'stopwatch' }
%span.hide
= custom_icon('icon_stopwatch') = custom_icon('icon_stopwatch')
- if issuable.has_attribute?(:due_date) - if issuable.has_attribute?(:due_date)
.block.due_date .block.due_date
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment