Skip to content

Commit

Permalink
#6946: Minor style fixes due to latest less update (#6963)
Browse files Browse the repository at this point in the history
  • Loading branch information
@allyoucanmap
allyoucanmap authored Jun 10, 2021
1 parent 827b250 commit 657eada
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 44 deletions.
52 changes: 26 additions & 26 deletions web/client/themes/default/less/geostory.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
}

.ms-sections-container-small-screen {
@ms-story-padding-small-screen: @square-btn-medium-size / 2 + 8px;
@ms-story-padding-small-screen: (@square-btn-medium-size / 2 + 8px);
.ms-section .ms-section-background .ms-section-background-container .ms-media {
/* alignment of content */
.ms-story-align-center();
Expand Down Expand Up @@ -296,25 +296,25 @@
&.ms-content-text {
.ms-content-body {
/* font size for all the main classes in text content */
p { font-size: @ms-story-font-size-base * 0.75; }
h1 { font-size: @ms-story-font-size-h1 * 0.75; }
h2 { font-size: @ms-story-font-size-h2 * 0.75; }
h3 { font-size: @ms-story-font-size-h3 * 0.75; }
h4 { font-size: @ms-story-font-size-h4 * 0.75; }
h5 { font-size: @ms-story-font-size-h5 * 0.75; }
h6 { font-size: @ms-story-font-size-h6 * 0.75; }
p { font-size: (@ms-story-font-size-base * 0.75); }
h1 { font-size: (@ms-story-font-size-h1 * 0.75); }
h2 { font-size: (@ms-story-font-size-h2 * 0.75); }
h3 { font-size: (@ms-story-font-size-h3 * 0.75); }
h4 { font-size: (@ms-story-font-size-h4 * 0.75); }
h5 { font-size: (@ms-story-font-size-h5 * 0.75); }
h6 { font-size: (@ms-story-font-size-h6 * 0.75); }
}
}
}
.ms-section.ms-expandable-background {
&.ms-section-title .ms-content-text,
&.ms-section-immersive .ms-content-column {
padding-right: @square-btn-medium-size + 8px;
padding-right: (@square-btn-medium-size + 8px);
}
}
}
.ms-sections-container-medium-screen {
@ms-story-padding-medium-screen: @square-btn-medium-size * 1.5;
@ms-story-padding-medium-screen: (@square-btn-medium-size * 1.5);
.ms-section .ms-section-background .ms-section-background-container {
/* size of content */
&.ms-size-full .ms-media { width: @ms-story-size-full; }
Expand All @@ -336,13 +336,13 @@
.ms-content {
&.ms-content-text {
.ms-content-body {
p { font-size: @ms-story-font-size-base * 0.80; }
h1 { font-size: @ms-story-font-size-h1 * 0.80; }
h2 { font-size: @ms-story-font-size-h2 * 0.80; }
h3 { font-size: @ms-story-font-size-h3 * 0.80; }
h4 { font-size: @ms-story-font-size-h4 * 0.80; }
h5 { font-size: @ms-story-font-size-h5 * 0.80; }
h6 { font-size: @ms-story-font-size-h6 * 0.80; }
p { font-size: (@ms-story-font-size-base * 0.80); }
h1 { font-size: (@ms-story-font-size-h1 * 0.80); }
h2 { font-size: (@ms-story-font-size-h2 * 0.80); }
h3 { font-size: (@ms-story-font-size-h3 * 0.80); }
h4 { font-size: (@ms-story-font-size-h4 * 0.80); }
h5 { font-size: (@ms-story-font-size-h5 * 0.80); }
h6 { font-size: (@ms-story-font-size-h6 * 0.80); }
}
}
/* size of content */
Expand Down Expand Up @@ -482,7 +482,7 @@
.ms-content-toolbar {
display: flex;
padding: 0 16px;
padding-top: @square-btn-medium-size / 2;
padding-top: (@square-btn-medium-size / 2);
.btn-group {
margin-right: 0;
margin-left: auto;
Expand All @@ -498,7 +498,7 @@
border-top: 1px solid @ms-story-bg-grey;
border-right: 1px solid @ms-story-bg-grey;
border-left: 1px solid @ms-story-bg-grey;
width: @square-btn-medium-size + 2;
width: (@square-btn-medium-size + 2);
border-top-left-radius: 50%;
margin-left: 50%;
transform: translateX(-50%);
Expand Down Expand Up @@ -550,8 +550,8 @@
/* render the toolbar has a floating container at top left corner of title container */
.ms-content-toolbar {
position: absolute;
margin-left: -@square-btn-medium-size / 2;
margin-top: -@square-btn-medium-size * 0.6;
margin-left: (-@square-btn-medium-size / 2);
margin-top: (-@square-btn-medium-size * 0.6);
padding: 0;
z-index: 2;
.shadow-soft();
Expand All @@ -563,8 +563,8 @@
where the alignment effect is not visible without this improvement
*/
&.ms-align-center .ms-content-body { margin-left: auto; margin-right: auto; }
&.ms-align-left .ms-content-body { margin-left: @square-btn-medium-size + 8px; margin-right: auto; }
&.ms-align-right .ms-content-body { margin-left: auto; margin-right: @square-btn-medium-size + 8px; }
&.ms-align-left .ms-content-body { margin-left: (@square-btn-medium-size + 8px); margin-right: auto; }
&.ms-align-right .ms-content-body { margin-left: auto; margin-right: (@square-btn-medium-size + 8px); }
/* text on full size should fill all the width of container */
&.ms-size-full {
width: 100%;
Expand Down Expand Up @@ -697,7 +697,7 @@
min-width: 500px;
display: flex; // align vertically the content
pointer-events: none; // pass pointer events to background (this div takes full width and height)
padding: 64px @square-btn-medium-size + 6px;
padding: 64px (@square-btn-medium-size + 6px);
padding-top: 164px;
&>.ms-content-body {
// override background of paragraph (or title) content.
Expand All @@ -707,8 +707,8 @@
&>.ms-content-toolbar {
position: absolute;
z-index: 2;
margin-left: -@square-btn-medium-size / 2;
margin-top: -@square-btn-medium-size * 0.6;
margin-left: (-@square-btn-medium-size / 2);
margin-top: (-@square-btn-medium-size * 0.6);
padding: 0;
.shadow-soft();
}
Expand Down
23 changes: 14 additions & 9 deletions web/client/themes/default/less/maps-properties.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
display: flex;
padding: 0 15px;
.ms-col-grab {
width: @icon-size / 2;
width: (@icon-size / 2);
padding: 0;
overflow: hidden;
display: flex;
span {
width: @icon-size / 4;
height: @icon-size / 2;
width: (@icon-size / 4);
height: (@icon-size / 2);
margin: auto;
}
}
Expand Down Expand Up @@ -60,7 +60,7 @@
}
}
.col-xs-12 {
margin-top: ( @square-btn-size - 34px) / 2;
margin-top: (( @square-btn-size - 34px) / 2);
.form-group {

height: @square-btn-size;
Expand All @@ -71,29 +71,34 @@
label {

.col-xs-6;
padding: 0;
float: left;
font-weight: normal;
line-height: 34px;
margin: 0;
margin-top:( @square-btn-size - 34px) / 2;
margin-top:(( @square-btn-size - 34px) / 2);
}
input {
margin-top:( @square-btn-size - 34px) / 2;
margin-top:(( @square-btn-size - 34px) / 2);
float: left;
.col-xs-6;
padding: 4px 8px;
}
}
}
.dropzone-thumbnail-container, .dropzone-filedrop-container {
label {
.col-xs-6;
padding: 0;
float: left;

font-weight: normal;
}
.dropzone {
overflow: hidden;
float: left;
.col-xs-6;
padding: 0;
transition: 0.3s;
&:hover {
transform: scale(1.05);
Expand Down Expand Up @@ -227,7 +232,7 @@
}
button {
float: right;
margin-top: (@square-btn-size - @square-btn-medium-size) / 2;
margin-top: ((@square-btn-size - @square-btn-medium-size) / 2);
}
.ms-permission-title {
width: ~"calc(50% - 20px)";
Expand All @@ -251,13 +256,13 @@
margin: 0;

.m-label {
margin-top:( @square-btn-size - @square-btn-medium-size) / 2;
margin-top:(( @square-btn-size - @square-btn-medium-size) / 2);
height: @square-btn-medium-size;
line-height: @square-btn-medium-size;
}

.btn-group {
margin-top:( @square-btn-size - @square-btn-medium-size) / 2;
margin-top:(( @square-btn-size - @square-btn-medium-size) / 2);
}

.ms-details-sheet {
Expand Down
6 changes: 3 additions & 3 deletions web/client/themes/default/less/modal.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

& > .modal-header {
height: @square-btn-size;
padding: (@square-btn-size - @font-size-h4) / 2;
padding: ((@square-btn-size - @font-size-h4) / 2);
border: none;
flex-shrink: 0;
.modal-title {
Expand Down Expand Up @@ -193,7 +193,7 @@
min-height: @square-btn-size;
}
.btn-group {
margin: (@square-btn-size - 34) / 2;
margin: ((@square-btn-size - 34) / 2);
}
}
}
Expand Down Expand Up @@ -275,7 +275,7 @@
.shadow-soft;
min-height: @square-btn-size;
// 24px height of quill icons
padding: (@square-btn-size - 24px) / 2;
padding: ((@square-btn-size - 24px) / 2);

}
.ql-container {
Expand Down
2 changes: 1 addition & 1 deletion web/client/themes/default/less/query-panel.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

.mapstore-switch-panel {
margin-bottom: @square-btn-small-size;
padding: 0 @square-btn-small-size / 2;
padding: 0 (@square-btn-small-size / 2);
border: none;
.shadow-soft;
.panel-title {
Expand Down
2 changes: 1 addition & 1 deletion web/client/themes/default/less/react-select.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

@select-item-bg: fade(@select-primary-color, 8%);
@select-item-bg-fb: mix(@select-primary-color, @select-input-bg, 8%); // Fallback color for IE 8
@select-item-color: contrast(@select-primary-color);
@select-item-color: @ms2-color-text;
@select-item-border-color: fade(@select-primary-color, 24%);
@select-item-border-color-fb: mix(@select-primary-color, @select-input-bg, 24%); // Fallback color for IE 8
@select-item-hover-color: darken(@select-item-color, 5%);
Expand Down
10 changes: 10 additions & 0 deletions web/client/themes/default/less/react-widgets.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Overrides for react-widget styles
@import 'react-widgets/lib/less/react-widgets.less';
// override the computation of the buttons using parenthesis
// to get the correct value
.rw-numberpicker {
.rw-btn {
height: (@input-height / 2);
line-height: (@input-height / 2);
}
}
2 changes: 1 addition & 1 deletion web/client/themes/default/less/switch.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.mapstore-switch-btn {
position: relative;
display: inline-block;
width: (@square-btn-small-size * 2) - 8px; /* 60 */
width: ((@square-btn-small-size * 2) - 8px); /* 60 */
height: @square-btn-small-size; /* 34 */
.m-slider {

Expand Down
2 changes: 1 addition & 1 deletion web/client/themes/default/less/switchpanel.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
.btn-group {
float: right;
margin: ((@square-btn-size - @square-btn-small-size) / 2) - 2 0;
margin: (((@square-btn-size - @square-btn-small-size) / 2) - 2) 0;
margin-right: (((@square-btn-size - @square-btn-small-size) / 2) - 2) / 2;
.square-button-sm {
padding: 0;
Expand Down
4 changes: 2 additions & 2 deletions web/client/themes/default/less/toc.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
}

.form-group {
margin: (@square-btn-size - @square-btn-medium-size)/2 0 0 0;
margin: ((@square-btn-size - @square-btn-medium-size)/2) 0 0 0;
.input-group {
height: @square-btn-medium-size;
width: 100%;
Expand All @@ -74,7 +74,7 @@
}

.btn-group {
margin: (@square-btn-size - @square-btn-medium-size)/2 0 0 0;
margin: ((@square-btn-size - @square-btn-medium-size)/2) 0 0 0;

.btn-group {
margin-top: 0px;
Expand Down
1 change: 1 addition & 0 deletions web/client/themes/default/ms2-theme.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
@import "./less/query-panel.less";
@import "./less/react-data-grid.less";
@import "./less/react-select.less";
@import "./less/react-widgets.less";
@import "./less/rulesmanager.less";
@import "./less/searchbar.less";
@import "./less/select.less";
Expand Down

0 comments on commit 657eada

Please sign in to comment.