Merge remote-tracking branch 'origin/spis-master' into bar_search
# Conflicts: # css/area_content.less # css/area_nav-breadcrumb.less
This commit is contained in:
commit
863ddc8263
8 changed files with 135 additions and 87 deletions
|
@ -395,14 +395,14 @@ kbd {
|
|||
background-color: @color-site-bg;
|
||||
color: @color-text;
|
||||
box-shadow: inset 0 0 .3em @color-border;
|
||||
border-radius: 2px;
|
||||
border-radius: @fix_border-radius;
|
||||
}
|
||||
|
||||
pre {
|
||||
overflow: auto;
|
||||
word-wrap: normal;
|
||||
border: 1px solid @color-border;
|
||||
border-radius: 2px;
|
||||
border-radius: @fix_border-radius;
|
||||
box-shadow: inset 0 0 .5em @color-border;
|
||||
font-size: @font-size-default;
|
||||
line-height: 140%;
|
||||
|
@ -520,7 +520,7 @@ select,
|
|||
keygen {
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: inset 0 0 1px #eee;
|
||||
border-radius: 2px;
|
||||
border-radius: @fix_border-radius;
|
||||
}
|
||||
|
||||
input:active,
|
||||
|
@ -549,7 +549,7 @@ button {
|
|||
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
|
||||
background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 2px;
|
||||
border-radius: @fix_border-radius;
|
||||
color: #333;
|
||||
padding: .1em .5em;
|
||||
cursor: pointer;
|
||||
|
@ -576,7 +576,7 @@ button[type=submit],
|
|||
background-image: none;
|
||||
background-color: @button_background;
|
||||
border: 1px solid @button_background;
|
||||
border-radius: 2px;
|
||||
border-radius: @fix_border-radius;
|
||||
color: @button_color;
|
||||
padding: .3em @grid;
|
||||
transition: @transition background-color, @transition color;
|
||||
|
@ -598,7 +598,7 @@ input[type=button] {
|
|||
background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
|
||||
background-color: #eee;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 2px;
|
||||
border-radius: @fix_border-radius;
|
||||
color: #333;
|
||||
padding: .1em .5em;
|
||||
transition: @transition background-color, @transition color;
|
||||
|
@ -630,7 +630,7 @@ textarea[readonly] {
|
|||
background-color: #eee;
|
||||
opacity: .5;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 2px;
|
||||
border-radius: @fix_border-radius;
|
||||
color: #333;
|
||||
font-weight: normal;
|
||||
padding: .3em @grid;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue