Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
d0636e8a
Commit
d0636e8a
authored
Nov 03, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Update styles for bootstrap-3.3.7
parent
6b56aa8c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
27 deletions
+40
-27
apps/common/main/resources/less/asc-mixins.less
apps/common/main/resources/less/asc-mixins.less
+2
-2
apps/common/main/resources/less/buttons.less
apps/common/main/resources/less/buttons.less
+24
-16
apps/common/main/resources/less/combobox.less
apps/common/main/resources/less/combobox.less
+6
-1
apps/common/main/resources/less/dropdown-menu.less
apps/common/main/resources/less/dropdown-menu.less
+1
-4
apps/documenteditor/main/resources/less/rightmenu.less
apps/documenteditor/main/resources/less/rightmenu.less
+4
-4
apps/documenteditor/main/resources/less/statusbar.less
apps/documenteditor/main/resources/less/statusbar.less
+3
-0
No files found.
apps/common/main/resources/less/asc-mixins.less
View file @
d0636e8a
...
@@ -99,8 +99,8 @@
...
@@ -99,8 +99,8 @@
.button-otherstates-icon(@icon-class, @icon-size) {
.button-otherstates-icon(@icon-class, @icon-size) {
button.over > .@{icon-class} {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);}
button.over > .@{icon-class} {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);}
button.active > .@{icon-class},
button.active > .@{icon-class},
button:active > .@{icon-class} {background-position-x: -2*@icon-size; --bgX: -(2*@icon-size);}
button:active > .@{icon-class} {background-position-x: -2*@icon-size
!important
; --bgX: -(2*@icon-size);}
button.disabled > .@{icon-class} {background-position-x: -3*@icon-size; --bgX: -(3*@icon-size);}
button.disabled > .@{icon-class} {background-position-x: -3*@icon-size
!important
; --bgX: -(3*@icon-size);}
}
}
.button-otherstates-icon2(@icon-class, @icon-size) {
.button-otherstates-icon2(@icon-class, @icon-size) {
...
...
apps/common/main/resources/less/buttons.less
View file @
d0636e8a
...
@@ -60,6 +60,14 @@
...
@@ -60,6 +60,14 @@
background-position: @arrow-small-offset-x - 7px @arrow-small-offset-y;
background-position: @arrow-small-offset-x - 7px @arrow-small-offset-y;
}
}
}
}
&:active,
&.active {
&:focus,
&.focus {
outline: none;
}
}
}
}
.btn-toolbar {
.btn-toolbar {
...
@@ -79,8 +87,8 @@
...
@@ -79,8 +87,8 @@
display: none;
display: none;
}
}
&:hover,
&:hover
:not(.disabled)
,
.over {
.over
:not(.disabled)
{
background-color: @secondary;
background-color: @secondary;
}
}
...
@@ -141,8 +149,8 @@
...
@@ -141,8 +149,8 @@
background-color: transparent;
background-color: transparent;
font-weight: bold;
font-weight: bold;
&:hover,
&:hover
:not(.disabled)
,
.over {
.over
:not(.disabled)
{
background-color: @secondary;
background-color: @secondary;
}
}
...
@@ -312,13 +320,13 @@
...
@@ -312,13 +320,13 @@
border: 1px solid @input-border;
border: 1px solid @input-border;
.border-radius(@border-radius-small);
.border-radius(@border-radius-small);
&:hover,
&:hover
:not(.disabled)
,
.over {
.over
:not(.disabled)
{
background-color: @secondary !important;
background-color: @secondary !important;
}
}
&:active,
&:active
:not(.disabled)
,
&.active {
&.active
:not(.disabled)
{
background-color: @primary !important;
background-color: @primary !important;
color: white;
color: white;
}
}
...
@@ -346,13 +354,13 @@
...
@@ -346,13 +354,13 @@
margin-top: 5px;
margin-top: 5px;
}
}
&:hover,
&:hover
:not(.disabled)
,
.over {
.over
:not(.disabled)
{
background-color: @secondary !important;
background-color: @secondary !important;
}
}
&:active,
&:active
:not(.disabled)
,
&.active {
&.active
:not(.disabled)
{
background-color: @primary !important;
background-color: @primary !important;
color: white;
color: white;
}
}
...
@@ -379,13 +387,13 @@
...
@@ -379,13 +387,13 @@
background-repeat: no-repeat;
background-repeat: no-repeat;
}
}
&:hover,
&:hover
:not(.disabled)
,
.over {
.over
:not(.disabled)
{
background-color: @secondary !important;
background-color: @secondary !important;
}
}
&:active,
&:active
:not(.disabled)
,
&.active {
&.active
:not(.disabled)
{
background-color: @primary !important;
background-color: @primary !important;
}
}
...
...
apps/common/main/resources/less/combobox.less
View file @
d0636e8a
...
@@ -36,9 +36,14 @@
...
@@ -36,9 +36,14 @@
.form-control {
.form-control {
.border-right-radius(0);
.border-right-radius(0);
border-right: 0;
border-right: 0;
position: initial;
z-index: initial;
float: none;
}
}
.btn {
.btn,
.btn:hover,
.btn:focus {
.border-left-radius(0);
.border-left-radius(0);
border-left: 0;
border-left: 0;
border-color: @input-border;
border-color: @input-border;
...
...
apps/common/main/resources/less/dropdown-menu.less
View file @
d0636e8a
.dropdown-menu > .disabled > a {
.dropdown-menu > .disabled > a {
&:hover,
cursor: default;
&:focus {
cursor: default;
}
}
}
.dropdown-menu {
.dropdown-menu {
...
...
apps/documenteditor/main/resources/less/rightmenu.less
View file @
d0636e8a
...
@@ -194,14 +194,14 @@
...
@@ -194,14 +194,14 @@
.btn-edit-table {background-position: 0 0;}
.btn-edit-table {background-position: 0 0;}
button.over .btn-edit-table {background-position: -28px 0;}
button.over .btn-edit-table {background-position: -28px 0;}
.btn-group.open .btn-edit-table,
.btn-group.open .btn-edit-table,
button.active .btn-edit-table,
button.active
:not(.disabled)
.btn-edit-table,
button:active .btn-edit-table {background-position: -56px 0;}
button:active
:not(.disabled)
.btn-edit-table {background-position: -56px 0;}
.btn-change-shape {background-position: 0 -16px;}
.btn-change-shape {background-position: 0 -16px;}
button.over .btn-change-shape {background-position: -28px -16px;}
button.over .btn-change-shape {background-position: -28px -16px;}
.btn-group.open .btn-change-shape,
.btn-group.open .btn-change-shape,
button.active .btn-change-shape,
button.active
:not(.disabled)
.btn-change-shape,
button:active .btn-change-shape {background-position: -56px -16px;}
button:active
:not(.disabled)
.btn-change-shape {background-position: -56px -16px;}
.combo-pattern-item {
.combo-pattern-item {
.background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px);
.background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px);
...
...
apps/documenteditor/main/resources/less/statusbar.less
View file @
d0636e8a
...
@@ -58,6 +58,9 @@
...
@@ -58,6 +58,9 @@
white-space: nowrap;
white-space: nowrap;
padding-top: 3px;
padding-top: 3px;
vertical-align: top;
vertical-align: top;
&.dropup {
position: initial;
}
}
}
.separator {
.separator {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment