Skip to content

Commit

Permalink
Align history and tool panel margins
Browse files Browse the repository at this point in the history
  • Loading branch information
@guerler
guerler committed Oct 11, 2018
1 parent fb52755 commit 12746a9
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 98 deletions.
6 changes: 3 additions & 3 deletions client/galaxy/style/scss/base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ body {

.unified-panel-header {
@extend .unselectable;
@extend .m-2;
@extend .mx-3;
height: $panel_header_height;
z-index: 1000;
font-size: 1rem;
Expand Down Expand Up @@ -257,7 +257,7 @@ body {
}

.unified-panel-controls {
padding: 0 $margin-v;
@extend .px-3;
}

.unified-panel-footer {
Expand Down Expand Up @@ -1611,7 +1611,7 @@ div.permissionContainer {
}
background: $panel-bg-color;
min-height: 100%;
padding: $margin-h $margin-v;
@extend .m-3;
}

div.toolSectionPad {
Expand Down
28 changes: 4 additions & 24 deletions client/galaxy/style/scss/history.scss
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,32 @@
// ---------------------------------------------------------------------------- all histories
// all histories
.history-panel {
@extend .flex-vertical-container;

> .controls {
margin: $margin-h $margin-v;
padding: 0px;
@extend .px-3;
flex: 0 0 auto;

.title {
margin-bottom: 4px;
input {
width: 100%;
// keep the text in position
margin: -3px 0px -3px -3px;
font-weight: bold;
}
}
.subtitle:not(:empty) {
min-height: 15px;
margin: -4px 0px 8px;
span + span:before {
content: ", ";
}
}
.history-size {
float: left;
margin: 4px 0 0;
@extend .mt-1;
}
.actions {
margin-bottom: 8px;
&:empty {
height: $icon-btn-size;
}
}

// TODO: remove
.messages {
clear: both;
margin-bottom: 0px;
& > * {
cursor: pointer;
&:last-child {
margin-bottom: 8px;
}
}
.quota-message {
display: none;
margin: 8px 0px 5px 0px;
}
}

Expand Down Expand Up @@ -190,7 +170,7 @@
}

> .empty-message {
margin: 0px 10px 0px 10px;
@extend .m-2;
}

.loading-indicator,
Expand Down
24 changes: 9 additions & 15 deletions client/galaxy/style/scss/list-item.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ $vertical-gap: 8px;
$spacing-right: $margin-v * 0.5;
$spacing-bottom: 6px;
$spacing-left: $margin-v * 0.5;
.padded {
padding: $spacing-top $spacing-right $spacing-bottom $spacing-left;
}

.warnings {
&:not(:empty) {
Expand Down Expand Up @@ -61,9 +58,9 @@ $vertical-gap: 8px;
float: left;
// always initially hidden and zero width
display: none;
width: 15px;
height: 32px;
margin: 9px;
@extend .pt-2;
@extend .pl-3;
width: 2.5rem;
font-size: 80%;
color: $btn-default-color;
cursor: pointer;
Expand All @@ -78,8 +75,8 @@ $vertical-gap: 8px;
.title-bar {
cursor: pointer;
outline: none;
@extend .padded;

@extend .p-2;
@extend .px-3;
.title {
display: inline;
font-weight: bold;
Expand Down Expand Up @@ -110,21 +107,18 @@ $vertical-gap: 8px;

.primary-actions {
@extend .icon-btn-group;
@extend .mt-2;
@extend .mx-3;
float: right;
margin: $spacing-top $spacing-right 0;
.icon-btn {
margin-left: $icon-btn-margin;
}
}

.details {
display: none;
padding: 0px $spacing-right $spacing-bottom $spacing-left;
//TODO: FIXME
//& > [class$:messagesmall] {
// margin: 0px 0px 8px 0px;
//}

@extend .pb-2;
@extend .px-3;
label {
margin: 0px;
padding: 0px;
Expand Down
93 changes: 37 additions & 56 deletions static/style/blue/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5585,7 +5585,7 @@ button.bg-dark:focus {
.m-1 {
margin: 0.25rem !important; }

.mt-1,
.mt-1, .history-panel > .controls .history-size,
.my-1 {
margin-top: 0.25rem !important; }

Expand Down Expand Up @@ -5617,10 +5617,10 @@ button.bg-dark:focus {
.errormessagesmall, .charts-client .charts-right
.warningmessagesmall, .charts-client .charts-right
.donemessagesmall, .charts-client .charts-right
.infomessagesmall, .unified-panel-header {
.infomessagesmall, .history-panel > .empty-message {
margin: 0.5rem !important; }

.mt-2,
.mt-2, .list-item .primary-actions,
.my-2 {
margin-top: 0.5rem !important; }

Expand All @@ -5636,23 +5636,27 @@ button.bg-dark:focus {
.mx-2 {
margin-left: 0.5rem !important; }

.m-3 {
.m-3, .toolMenuContainer {
margin: 1rem !important; }

.mt-3,
.my-3 {
margin-top: 1rem !important; }

.mr-3,
.mx-3 {
.mx-3,
.unified-panel-header,
.list-item .primary-actions {
margin-right: 1rem !important; }

.mb-3,
.my-3 {
margin-bottom: 1rem !important; }

.ml-3,
.mx-3 {
.mx-3,
.unified-panel-header,
.list-item .primary-actions {
margin-left: 1rem !important; }

.m-4 {
Expand Down Expand Up @@ -5732,18 +5736,18 @@ button.bg-dark:focus {
.px-1 {
padding-left: 0.25rem !important; }

.p-2 {
.p-2, .list-item .title-bar {
padding: 0.5rem !important; }

.pt-2,
.pt-2, .list-item .selector,
.py-2 {
padding-top: 0.5rem !important; }

.pr-2,
.px-2 {
padding-right: 0.5rem !important; }

.pb-2,
.pb-2, .list-item .details,
.py-2 {
padding-bottom: 0.5rem !important; }

Expand All @@ -5759,15 +5763,23 @@ button.bg-dark:focus {
padding-top: 1rem !important; }

.pr-3,
.px-3 {
.px-3,
.unified-panel-controls,
.list-item .title-bar,
.list-item .details,
.history-panel > .controls {
padding-right: 1rem !important; }

.pb-3,
.py-3 {
padding-bottom: 1rem !important; }

.pl-3,
.px-3 {
.pl-3, .list-item .selector,
.px-3,
.unified-panel-controls,
.list-item .title-bar,
.list-item .details,
.history-panel > .controls {
padding-left: 1rem !important; }

.p-4 {
Expand Down Expand Up @@ -12204,9 +12216,6 @@ body {
padding-right: 1.75em;
background: url(../images/dropdownarrow.png) no-repeat right 7px; }

.unified-panel-controls {
padding: 0 1.5rem; }

.unified-panel-footer, .panel-collapse {
position: relative;
height: 25px;
Expand Down Expand Up @@ -13261,8 +13270,6 @@ div.permissionContainer {

.list-item {
border: 1px solid #bfbfbf; }
.list-item .padded, .list-item .title-bar {
padding: 6px 0.75rem 6px 0.75rem; }
.list-item .warnings:not(:empty) {
padding-top: 4px; }
.list-item .warnings [class$="messagesmall"] {
Expand All @@ -13278,9 +13285,7 @@ div.permissionContainer {
.list-item .selector {
float: left;
display: none;
width: 15px;
height: 32px;
margin: 9px;
width: 2.5rem;
font-size: 80%;
color: #333;
cursor: pointer;
Expand Down Expand Up @@ -13315,13 +13320,11 @@ div.permissionContainer {
.list-item .title-bar .state-description a {
color: inherit; }
.list-item .primary-actions {
float: right;
margin: 6px 0.75rem 0; }
float: right; }
.list-item .primary-actions .icon-btn, .list-item .primary-actions .ui-button-icon-plain {
margin-left: 2px; }
.list-item .details {
display: none;
padding: 0px 0.75rem 6px 0.75rem; }
display: none; }
.list-item .details label {
margin: 0px;
padding: 0px;
Expand Down Expand Up @@ -13717,37 +13720,19 @@ pre.peek {
font-size: 10px; }

.history-panel > .controls {
margin: 1rem 1.5rem;
padding: 0px;
flex: 0 0 auto; }
.history-panel > .controls .title {
margin-bottom: 4px; }
.history-panel > .controls .title input {
width: 100%;
margin: -3px 0px -3px -3px;
font-weight: bold; }
.history-panel > .controls .subtitle:not(:empty) {
min-height: 15px;
margin: -4px 0px 8px; }
.history-panel > .controls .subtitle:not(:empty) span + span:before {
content: ", "; }
.history-panel > .controls .title input {
font-weight: bold; }
.history-panel > .controls .subtitle:not(:empty) span + span:before {
content: ", "; }
.history-panel > .controls .history-size {
float: left;
margin: 4px 0 0; }
.history-panel > .controls .actions {
margin-bottom: 8px; }
.history-panel > .controls .actions:empty {
height: 22px; }
float: left; }
.history-panel > .controls .actions:empty {
height: 22px; }
.history-panel > .controls .messages {
clear: both;
margin-bottom: 0px; }
.history-panel > .controls .messages > * {
cursor: pointer; }
.history-panel > .controls .messages > *:last-child {
margin-bottom: 8px; }
clear: both; }
.history-panel > .controls .messages .quota-message {
display: none;
margin: 8px 0px 5px 0px; }
display: none; }
.history-panel > .controls .tags-display,
.history-panel > .controls .annotation-display {
display: none;
Expand Down Expand Up @@ -13850,9 +13835,6 @@ pre.peek {
.history-panel > .list-items .list-item:first-child {
border-top-width: 0px; }

.history-panel > .empty-message {
margin: 0px 10px 0px 10px; }

.history-panel .loading-indicator,
.history-panel .contents-loading-indicator {
display: inline-block;
Expand Down Expand Up @@ -14817,8 +14799,7 @@ pre.peek {
.toolMenuContainer {
color: #212529;
background: #f8f9fa;
min-height: 100%;
padding: 1rem 1.5rem; }
min-height: 100%; }
.toolMenuContainer a {
color: #212529; }

Expand Down

0 comments on commit 12746a9

Please sign in to comment.