Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add .action-label

Browse source 
in the calendar case it needs a <div class="action-flow action-flow--noWrap"> as parent element
This commit is contained in:
Felix Niklas 2015-09-22 17:16:29 +02:00
parent 56288aba42
commit b2437ead50
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/views/calendar/index.jst.eco
View file

@ -19,7 +19,10 @@
<div class="action" data-id="<%- calendar.id %>"> <div class="action" data-id="<%- calendar.id %>">
<div class="action-flow action-flow--row"> <div class="action-flow action-flow--row">
<div class="action-row"> <div class="action-row">
<h2><span title="Last iCal Feed sync at: <%= calendar.last_sync %>: <%= calendar.last_log %>"><%- @Icon('status', 'ok inline') %></span> <%= calendar.name %></h2> <div class="action-flow action-flow--noWrap">
<h2><span title="Last iCal Feed sync at: <%= calendar.last_sync %>: <%= calendar.last_log %>"><%- @Icon('status', 'ok inline') %></span> <%= calendar.name %></h2>
<div class="action-label">Default</div>
</div>
</div> </div>
<div class="action-row"> <div class="action-row">
<div class="label"><%- @T('Timezone') %></div> <%= calendar.timezone %> <div class="label"><%- @T('Timezone') %></div> <%= calendar.timezone %>

15
app/assets/stylesheets/zammad.css.scss
View file

@ -6158,6 +6158,10 @@ output {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
&.action-flow--noWrap {
flex-wrap: nowrap;
}
&.action-flow--row { &.action-flow--row {
flex-basis: 100%; flex-basis: 100%;
} }
@ -6204,6 +6208,17 @@ output {
color: hsl(0,0%,60%); color: hsl(0,0%,60%);
margin-top: 0; margin-top: 0;
} }
.action-label {
margin-left: auto;
background: hsl(197,20%,93%);
border: 1px solid hsl(197,20%,88%);
align-self: flex-start;
padding: 5px 10px;
margin-right: -25px;
margin-top: -4px;
color: hsl(197,16%,65%);
}
.action-flow-icon { .action-flow-icon {
align-self: center; align-self: center;