Skip to content

Commit

Permalink
updated to match new ionic sass/styling crap
Browse files Browse the repository at this point in the history
  • Loading branch information
@pliablepixels
pliablepixels committed Nov 25, 2017
1 parent 04e34d3 commit 89b3cd5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion scss/ionic.app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $dark: #444 !default;
$button-stable-text: #fff !default;
$button-stable-border: $stable !default;
$button-stable-active-border: $stable !default;

$button-stable-active-bg: darken($stable, 10%) !default;

$button-positive-text: #fff !default;
$button-positive-border: $positive !default;
Expand Down
14 changes: 7 additions & 7 deletions www/css/ionic.app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4114,7 +4114,7 @@ a.subdued {
text-decoration: none; }
.bar-stable .button.active, .bar-stable .button.activated {
border-color: #2F81B7;
background-color: #e5e5e5; }
background-color: #25648e; }
.bar-stable .button.button-clear {
border-color: transparent;
background: none;
Expand Down Expand Up @@ -5820,15 +5820,15 @@ ion-tabs.tabs-striped.tabs-color-active-dark .tab-item.tab-item-active, ion-tabs
.item .item-content.active.item-stable,
.item .item-content.activated.item-stable {
border-color: #2F81B7;
background-color: #e5e5e5; }
background-color: #25648e; }
.item.active.item-stable.item-complex > .item-content,
.item.activated.item-stable.item-complex > .item-content,
.item-complex.active .item-content.item-stable.item-complex > .item-content,
.item-complex.activated .item-content.item-stable.item-complex > .item-content,
.item .item-content.active.item-stable.item-complex > .item-content,
.item .item-content.activated.item-stable.item-complex > .item-content {
border-color: #2F81B7;
background-color: #e5e5e5; }
background-color: #25648e; }
.item.active.item-positive,
.item.activated.item-positive,
.item-complex.active .item-content.item-positive,
Expand Down Expand Up @@ -6044,10 +6044,10 @@ a.item-content {
color: #fff; }
.item-complex.item-stable > .item-content.active, .item-complex.item-stable > .item-content:active {
border-color: #2F81B7;
background-color: #e5e5e5; }
background-color: #25648e; }
.item-complex.item-stable > .item-content.active.item-complex > .item-content, .item-complex.item-stable > .item-content:active.item-complex > .item-content {
border-color: #2F81B7;
background-color: #e5e5e5; }
background-color: #25648e; }

.item-complex.item-positive > .item-content {
border-color: #2F81B7;
Expand Down Expand Up @@ -8589,7 +8589,7 @@ progress {
text-decoration: none; }
.button.active, .button.activated {
border-color: #2F81B7;
background-color: #e5e5e5; }
background-color: #25648e; }
.button:after {
position: absolute;
top: -6px;
Expand Down Expand Up @@ -8653,7 +8653,7 @@ progress {
text-decoration: none; }
.button.button-stable.active, .button.button-stable.activated {
border-color: #2F81B7;
background-color: #e5e5e5; }
background-color: #25648e; }
.button.button-stable.button-clear {
border-color: transparent;
background: none;
Expand Down
2 changes: 1 addition & 1 deletion www/css/ionic.app.min.css
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions www/templates/events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@
</div>
<span style="float:right">
<div ng-if="event.Event.EndTime || 1">
<button class="button button-small button-outline icon icon-left ion-stats-bars"
<button class="button button-stable button-small button-outline icon icon-left ion-stats-bars"
ng-click="closeIfOpen(event);analyzeEvent(event)" >
<span translate="kAnalyze"></span>
</button>
<button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="toggleGroupScrub(event,$index,event.Event.Frames)"> <span translate="kScrub"></span>
<button class="button button-stable button-outline button-small icon icon-left ion-ios-eye" ng-click="toggleGroupScrub(event,$index,event.Event.Frames)"> <span translate="kScrub"></span>
</button>
<button ng-if="event.Event.AlarmFrames > 0" class="button button-outline button-small icon icon-left ion-ios-bell" ng-click="toggleGroupAlarms(event,$index,event.Event.Frames)"> <span translate="kAlarms"></span>
<button ng-if="event.Event.AlarmFrames > 0" class="button button-stable button-outline button-small icon icon-left ion-ios-bell" ng-click="toggleGroupAlarms(event,$index,event.Event.Frames)"> <span translate="kAlarms"></span>
</button>
<button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="closeIfOpen(event);openModal(event)"> <span translate="kFootage"></span>
<button class="button button-stable button-outline button-small icon icon-left ion-ios-eye" ng-click="closeIfOpen(event);openModal(event)"> <span translate="kFootage"></span>
</button>


Expand All @@ -123,11 +123,11 @@
<p>
<!--scroll <i class="icon ion-arrow-left-c"></i>
<i class="icon ion-arrow-right-c"></i>-->
<button ng-click="toggleTypeOfAlarms()" class="button button-small button-assertive button-outline">
<button ng-click="toggleTypeOfAlarms()" class="button button-small button-assertive button-stable button-outline">
<span translate="kType"></span>:{{typeOfFrames}}
</button>
<button
ng-click="toggleMotionOutline()" class="button button-small button-assertive button-outline">
ng-click="toggleMotionOutline()" class="button button-small button-assertive button-stable button-outline">
<span translate="kOutlineMotion"></span>:{{outlineMotion}}
</button>
</p>
Expand Down

0 comments on commit 89b3cd5

Please sign in to comment.