Skip to content

Improve designer tool not to overflow over content #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2014
Merged

Improve designer tool not to overflow over content #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions lib/app/js/directives/design.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ angular.module('sgApp')
scope.resetLocal = function() {
Variables.resetLocal();
}

scope.isColor = function(value) {
if (/^(#|rgb)/.test(value)) return true;
return false;
}
}
};
}]);
113 changes: 67 additions & 46 deletions lib/app/sass/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,12 @@ $mobile: new-breakpoint(max-width 480px);
}
}

.sg.wrapper.desigerToolVisible {
margin-right: $designer-tool-width;
padding-right: 30px;
}


// Header and footer
//
// The header and footer are included in all styleguide pages
Expand Down Expand Up @@ -378,6 +384,11 @@ $mobile: new-breakpoint(max-width 480px);
&.error {
background-color: #d2301c;
}

&.desigerToolVisible .inner {
margin-right: $designer-tool-width;
padding-right: 30px;
}
}

// Footer
Expand Down Expand Up @@ -653,46 +664,6 @@ $mobile: new-breakpoint(max-width 480px);
border-bottom: none;
padding: 1em;
position: relative;

.sg.label {
background: rgba(#FFF, 0.9);
position: absolute;
top: 0;
right: 0;
border: 1px solid $secondary-color;
border-top: none;
border-right: none;
z-index: 8000;

span, p {
padding: 0 0.8em 0 0;
text-decoration: none;
font-weight: 500;
display: inline;
}

a {
cursor: pointer;
display: inline-block;
padding: 0.4em 0.7em;
text-decoration: none;
}

a:hover {
i.fa {
color: rgba($primary-color, 0.7);
&:after {
opacity: 1;
}
}
}

i.fa {
cursor: pointer;
color: rgba($primary-color, 0.2);
@include transition(all 0.4s ease-out);
}
}
}

.sg.code-listing {
Expand Down Expand Up @@ -779,6 +750,46 @@ $mobile: new-breakpoint(max-width 480px);
}
}

.sg.label {
background: rgba(#FFF, 0.9);
position: absolute;
top: 0;
right: 0;
border: 1px solid $secondary-color;
border-top: none;
border-right: none;
z-index: 8000;

span, p {
padding: 0 0.8em 0 0;
text-decoration: none;
font-weight: 500;
display: inline;
}

a {
cursor: pointer;
display: inline-block;
padding: 0.4em 0.7em;
text-decoration: none;
}

a:hover {
i.fa {
color: rgba($primary-color, 0.7);
&:after {
opacity: 1;
}
}
}

i.fa {
cursor: pointer;
color: rgba($primary-color, 0.2);
@include transition(all 0.4s ease-out);
}
}

// Designer tool
//
// Styles for styleguide designer tool
Expand Down Expand Up @@ -821,15 +832,12 @@ $mobile: new-breakpoint(max-width 480px);
left: 100%;
width: $designer-tool-width;
height: 100%;
border-top: 1px solid rgba(#000, 0.3);
border-bottom: 1px solid rgba(#000, 0.3);
border-left: 1px solid rgba(#000, 0.3);
z-index: 9000;

background: rgba(#fff, 1);
@include transition(left 0.3s ease-out);

.handle {
@include transition(left 0.3s ease-out);
@include transition-delay(0.3s);
position: absolute;
top: 220px;
left: -30px;
Expand All @@ -848,12 +856,23 @@ $mobile: new-breakpoint(max-width 480px);
@include transform-origin(left top);
}

.close {
position: absolute;
padding: 10px;
right: 0;
top: 0;
}

&.sg-hidden {
left: 100%;
}

&.sg-visible {
left: 100% - $designer-tool-width;;
left: 100% - $designer-tool-width;

.handle {
left: 0;
}
}
}

Expand All @@ -864,6 +883,8 @@ $mobile: new-breakpoint(max-width 480px);
width: 100%;
height: 100%;
padding: 1em;
z-index: 9000;
background: white;

label {
display: block;
Expand Down
4 changes: 2 additions & 2 deletions lib/app/views/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="socketDisconnection" class="sg disconnection-icon" title="no socket connection" ng-hide="socketService.isConnected()" ng-if="socketService.isAvailable()">
<i class="fa fa-chain-broken"></i>
</div>
<header class="sg header" ng-class="status.compileError ? 'error' : '' ">
<header class="sg header" ng-class="designerTool.isVisible ? 'desigerToolVisible' : ''" ng-class="status.compileError ? 'error' : '' ">
<div class="inner">
<div class="title">
<a ng-href="/overview">
Expand All @@ -13,7 +13,7 @@ <h1 class="sg">{{ config.data.title }}
</div>
</div>
</header>
<div class="sg wrapper" ng-class="isNavCollapsed ? 'collapsed' : ''">
<div class="sg wrapper" ng-class="designerTool.isVisible ? 'desigerToolVisible' : ''" ng-class="isNavCollapsed ? 'collapsed' : ''">
<div class="sg side-nav-toggle"
ng-click="isNavCollapsed = !isNavCollapsed">
{{ isNavCollapsed ? "&gt;&gt;" : "&lt;&lt;" }}
Expand Down
5 changes: 5 additions & 0 deletions lib/app/views/partials/design.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
Designer Tools
</div>
<div class="sg design-content" ng-click="$event.stopPropagation()">
<div class="sg label">
<a ng-click="designerTool.isVisible = false">
<i class="fa fa-close"></i>
</a>
</div>
<a class="sg" ng-click="showRelated = true" ng-hide="showRelated">Show only related variables</a>
<a class="sg" ng-click="showRelated = false" ng-show="showRelated">Show all variables</a>
<h3 class="sg" ng-show="showRelated">{{currentReference.section.reference}} {{currentReference.section.header}}</h3>
Expand Down