Skip to content

Commit

Permalink
Fix #2015 Update theme and icons for editing workflow (#2032)
Browse files Browse the repository at this point in the history
  • Loading branch information
allyoucanmap authored and offtherailz committed Jul 17, 2017
1 parent d17a591 commit a5d5a74
Show file tree
Hide file tree
Showing 40 changed files with 2,833 additions and 6,463 deletions.
5,016 changes: 70 additions & 4,946 deletions web/client/themes/default/bootstrap-theme.less

Large diffs are not rendered by default.

867 changes: 867 additions & 0 deletions web/client/themes/default/bootstrap-variables.less

Large diffs are not rendered by default.

140 changes: 140 additions & 0 deletions web/client/themes/default/icons.less
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,11 @@
.glyphicon-pause:before {
content: "\e073";
}
/*
.glyphicon-pencil:before {
content: "\270f";
}
*/
.glyphicon-phone:before {
content: "\e145";
}
Expand Down Expand Up @@ -715,3 +717,141 @@
.glyphicon-eye-close:before {
content: "\e106";
}

/* new */
.glyphicon-row-add:before {
content: "\002d";
}
.glyphicon-row-trash:before {
content: "\002e";
}
.glyphicon-features-grid-download:before {
content: "\0038";
}

.glyphicon-plus-square:before {
content: "\0035";
}
.glyphicon-remove-square:before {
content: "\0036";
}
.glyphicon-trash-square:before {
content: "\0037";
}

.glyphicon-row-add:before {
content: "\002d";
}
.glyphicon-row-trash:before {
content: "\002e";
}
.glyphicon-features-grid:before {
content: "\002f";
}
.glyphicon-features-grid-set:before {
content: "\0030";
}
.glyphicon-pencil:before {
content: "\0031";
}
.glyphicon-pencil-add:before {
content: "\0032";
}
.glyphicon-pencil-edit:before {
content: "\0033";
}
.glyphicon-zoom-to:before {
content: "\0034";
}

.glyphicon-back:before {
content: "\003c";
}
.glyphicon-next:before {
content: "\003e";
}
.glyphicon-undo:before {
content: "\003b";
}
.glyphicon-redo:before {
content: "\003f";
}
/* geometry */
.glyphicon-point:before {
content: "\007e";
}
.glyphicon-polyline:before {
content: "\007f";
}
.glyphicon-polygon:before {
content: "\0080";
}

.glyphicon-point-plus:before {
content: "\0081";
}
.glyphicon-polyline-plus:before {
content: "\0082";
}
.glyphicon-polygon-plus:before {
content: "\0083";
}

.glyphicon-point-remove:before {
content: "\0084";
}
.glyphicon-polyline-remove:before {
content: "\0085";
}
.glyphicon-polygon-remove:before {
content: "\0086";
}

.glyphicon-point-dash:before {
content: "\0087";
}
.glyphicon-polyline-dash:before {
content: "\0088";
}
.glyphicon-polygon-dash:before {
content: "\0089";
}

.glyphicon-point-trash:before {
content: "\008a";
}
.glyphicon-polyline-trash:before {
content: "\008b";
}
.glyphicon-polygon-trash:before {
content: "\008c";
}

.glyphicon-point-minus:before {
content: "\008d";
}
.glyphicon-polyline-minus:before {
content: "\008e";
}
.glyphicon-polygon-minus:before {
content: "\008f";
}

.glyphicon-line:before {
content: "\0090";
}
.glyphicon-line-plus:before {
content: "\0091";
}
.glyphicon-line-remove:before {
content: "\0092";
}
.glyphicon-line-dash:before {
content: "\0093";
}
.glyphicon-line-trash:before {
content: "\0094";
}
.glyphicon-line-minus:before {
content: "\0095";
}
Binary file modified web/client/themes/default/icons/icons.eot
Binary file not shown.
667 changes: 417 additions & 250 deletions web/client/themes/default/icons/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/client/themes/default/icons/icons.ttf
Binary file not shown.
Binary file modified web/client/themes/default/icons/icons.woff
Binary file not shown.
37 changes: 37 additions & 0 deletions web/client/themes/default/less/ag-grid.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// feature grid
.ag-fresh .ag-header,
.ag-fresh .ag-tool-panel-container {
background: @ms2-color-primary !important;
color: @ms2-color-text-primary;
font-family: @font-family-base;
}

.ag-fresh .ag-tool-panel-container .ag-list-selection {
color: #000000;
}

.ag-fresh .ag-paging-button {
color: @ms2-color-primary;
background-color: @ms2-color-background;
border: @ms2-color-primary 1px solid;
}

.ag-fresh .ag-paging-page-summary-panel {
color: @ms2-color-primary;
}

.ag-fresh .ag-paging-panel {
background-color: @ms2-color-background;
}

.ag-fresh .ag-body {
background-color: @ms2-color-background !important;
}

.ag-fresh .ag-body .ag-row-even {
background-color: @ms2-color-background !important;
}

.ag-fresh .ag-body .ag-row-odd {
background-color: darken(@ms2-color-background,5%) !important;
}
16 changes: 16 additions & 0 deletions web/client/themes/default/less/autocomplete.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.autocompleteField .autocomplete-toolbar .chevron-left {
float: left;
color: @ms2-color-primary;
}
.autocompleteField .autocomplete-toolbar .chevron-right {
float: right;
color: @ms2-color-primary;
}

.autocompleteField .autocomplete-toolbar .rw-list-option:hover {
color: @ms2-color-primary-hover;
}

.autocompleteField ul li:last-child {
border: none !important;
}
55 changes: 55 additions & 0 deletions web/client/themes/default/less/common.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
.shadow {
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.12), 0 4px 8px rgba(0, 0, 0, 0.24);
-moz-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.12), 0 4px 8px rgba(0, 0, 0, 0.24);
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.12), 0 4px 8px rgba(0, 0, 0, 0.24);
}

.shadow-soft {
-webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.06), 0 4px 8px rgba(0, 0, 0, 0.12);
-moz-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.06), 0 4px 8px rgba(0, 0, 0, 0.12);
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.06), 0 4px 8px rgba(0, 0, 0, 0.12);
}

.no-border {
border: none;
}

.no-border:active,
.no-border:active:focus,
.no-border:focus,
.no-border:hover {
box-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
outline: none;
}

.option-icon {
font-size: @font-size-base;
margin-right: @padding-left-square;
color: @ms2-color-primary;
}

.bg-body {
background-color: @ms2-color-background;
}

.text-body {
color: @ms2-color-text;
}

.flex-center {
display: flex;
align-items: center;
}

.btn {
outline: none !important;
}

textarea {
background-color: darken(@ms2-color-background, 5%);
color: @ms2-color-text;
border-color: @ms2-color-shade-lighter;
outline: none !important;
}
67 changes: 67 additions & 0 deletions web/client/themes/default/less/cookie.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
.mapstore-cookie-panel {
height: 100%;
overflow: auto;
display: block;
font-family: inherit;
position: fixed;
width: auto;
box-shadow: 0 0 5px 1px #5e5e5e;
z-index: 9998;
background-color: white;
box-sizing: border-box;
top: auto;
bottom: 0px;
left: 0px;
right: auto;
}

.cookie-body-container {
height: 100%;
position: relative;
width: 100%;
border-radius: 2px;
font-size: 13px;
padding: 10px;
display: block;
box-sizing: border-box;
opacity: 1;
transition: 0.3s ease-in-out;
transform: translate3d(0px, 0px, 0px);
will-change: transform, opacity;
background-color: white;
left: 0px;
text-align: justify;
}

.cookie-title {
font-size: 14px;
margin: 0px 0px 5px;
padding: 0px;
font-weight: bold;
color: @ms2-color-primary;
}

.cookie-action, .cookie-message {
margin: 0px;
padding: 0px;
}

.cookie-button {
border-radius: 2px;
padding: 6px 20px;
font-weight: bold;
margin: 10px 0px 0px;
border: 0px;
}

.cookie-header {
color: @ms2-color-primary;
height: 44px;
}

.cookie-header > span {
float: right;
cursor: pointer;
font-size: 40px;
width: 44px;
}
Loading

0 comments on commit a5d5a74

Please sign in to comment.