Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

This commit is contained in:
Duncan Sommerville 2015-08-19 13:02:16 -04:00
commit 42bbfc3834
5 changed files with 37 additions and 26 deletions

View file

@ -158,10 +158,6 @@ label.wrapp-label input[type="checkbox"] {
cursor: pointer;
}
/* Hack for calendar page icons */
.icon-white {
margin-right: 4px;
}
/*
.add-button {
border: 1px solid #5b5b5b;

View file

@ -3467,7 +3467,7 @@ button.btn-icon-text > i.icon-white {
-moz-box-sizing: border-box;
box-sizing: border-box;
width: 130px;
width: 150px;
flex: 1 auto;
padding: 0;
@ -3545,7 +3545,7 @@ button.btn-icon-text > i.icon-white {
position: absolute;
top: 102px;
left: 130px;
left: 150px;
right: 0;
bottom: 0;
padding: 10px 10px 40px;
@ -3575,7 +3575,7 @@ button.btn-icon-text > i.icon-white {
.usability_hint {
position: fixed;
top: 102px;
left: 130px;
left: 150px;
width: 100%;
flex: 0 100%;
@ -3589,7 +3589,7 @@ button.btn-icon-text > i.icon-white {
background-color: #ff611f;
color: white;
font-size: 14px;
text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.2);
text-shadow: 0px 0px 1px rgba(0, 0, 0, 0.1);
z-index: 99; /* Need to be above elements like the shows in the calendar! */
/*margin: 5px 10px;*/
@ -3662,3 +3662,13 @@ hr {
height: 1px;
background: rgba(255,255,255,0.2);
}
.icon-white {
margin-right: 4px;
}
.nav-ui-icon-formatter {
width:16px !important;
display:inline;
margin-right:4px
}