-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged PR 5078: Merged PR 5066: AB#9422 - FE refresh
Merged PR 5066: AB#9422 - FE refresh Related work items: #9422 Related work items: #9422
- Loading branch information
Showing
89 changed files
with
5,382 additions
and
3,914 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| $font-small:11px; | ||
| $font-normal:14px; | ||
| $font-basic:14px; | ||
| $font-medium:18px; | ||
| $font-big:20px; | ||
| $font-extrabig:24px; | ||
| $font-small: 11px; | ||
| $font-normal: 14px; | ||
| $font-basic: 14px; | ||
| $font-medium: 18px; | ||
| $font-big: 20px; | ||
| $font-extrabig: 24px; | ||
| //Navigation | ||
| $navigation-font-small:12px; | ||
| $navigation-font-basic:16px; | ||
| $navigation-font-basic-submenu:15px; | ||
| $navigation-icon-size:24px; | ||
| $navigation-font-small: 12px; | ||
| $navigation-font-basic: 14px; | ||
| $navigation-font-basic-submenu: 14px; | ||
| $navigation-icon-size: 24px; | ||
| //Tabs | ||
| $tab-font-header:16px; | ||
| $tab-font-header: 16px; | ||
| //Accordion | ||
| $accordion-header:16px; | ||
| $accordion-header: 16px; | ||
| //Breadcrumb | ||
| $breadcrumb-font:15px; | ||
| $breadcrumb-font: 15px; | ||
| // Link List | ||
| $link-list-title-font:15px; | ||
| $link-list-title-font: 15px; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,64 @@ | ||
| @import "../../abstracts/mixins"; | ||
| @import "../../abstracts/vars"; | ||
| label { | ||
| background: transparent; | ||
| color: $text-basic; | ||
| } | ||
| input, button { | ||
| display: inline-block; | ||
| box-sizing: border-box; | ||
| background: $bg-basic-color !important; | ||
| border: 1px solid $border-gray; | ||
| border-radius: 0 !important; | ||
| color: $text-basic; | ||
| font-weight: normal; | ||
| padding: 8px 2%; | ||
| clear: both; | ||
| height: auto; | ||
| font-size: $font-normal; | ||
| background: transparent; | ||
| color: $text-basic; | ||
| } | ||
| input, | ||
| button { | ||
| display: inline-block; | ||
| box-sizing: border-box; | ||
| background: $bg-basic-color !important; | ||
| border: 1px solid $border-gray; | ||
| border-radius: 0 !important; | ||
| color: $text-basic; | ||
| font-weight: normal; | ||
| padding: 8px 12px; | ||
| clear: both; | ||
| height: auto; | ||
| font-size: $font-normal; | ||
| } | ||
| input:focus { | ||
| border: 1px solid $border-gray; | ||
| border: 1px solid $border-gray; | ||
| } | ||
| input[type="submit"], input[type="reset"], input[type="button"], button { | ||
| border: 1px solid $border-basic-color; | ||
| padding: 5px 20px; | ||
| &:hover { | ||
| background: $bg-light-gray !important; | ||
| } | ||
| input[type="submit"], | ||
| input[type="reset"], | ||
| input[type="button"], | ||
| button { | ||
| border: 1px solid $border-basic-color; | ||
| padding: 5px 20px; | ||
| &:hover { | ||
| background: $bg-light-gray !important; | ||
| } | ||
| } | ||
| input::-moz-focus-inner, button::-moz-focus-inner { | ||
| border: 0; | ||
| padding: 0; | ||
| input::-moz-focus-inner, | ||
| button::-moz-focus-inner { | ||
| border: 0; | ||
| padding: 0; | ||
| } | ||
| input[type="text"] { | ||
| font-size: 13px; | ||
| font-size: 13px; | ||
| } | ||
| input[type="text"], input[type="email"], input[type="password"], textarea, select { | ||
| box-shadow: inset 0 1px 5px rgba(0, 0, 0, 0.1); | ||
| color: $text-basic; | ||
| width: 100%; | ||
| background: #fff; | ||
| border: 1px solid $border-gray; | ||
| input[type="text"], | ||
| input[type="email"], | ||
| input[type="password"], | ||
| textarea, | ||
| select { | ||
| color: $text-basic; | ||
| width: 100%; | ||
| background: #fff; | ||
| border: 1px solid $border-gray; | ||
| } | ||
| select { | ||
| display: inline-block; | ||
| vertical-align: middle; | ||
| *vertical-align: auto; | ||
| *zoom: 1; | ||
| *display: inline; | ||
| -moz-box-sizing: border-box; | ||
| -webkit-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| outline: none; | ||
| cursor: pointer; | ||
| padding: 5px; | ||
| display: inline-block; | ||
| vertical-align: middle; | ||
| *vertical-align: auto; | ||
| *zoom: 1; | ||
| *display: inline; | ||
| -moz-box-sizing: border-box; | ||
| -webkit-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| outline: none; | ||
| cursor: pointer; | ||
| padding: 5px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,103 @@ | ||
| h1, h2, h3, h4, h5, h6 { | ||
| color: $text-heading-color; | ||
| h1, | ||
| h2, | ||
| h3, | ||
| h4, | ||
| h5, | ||
| h6 { | ||
| @include proxima-font(bold); | ||
|
|
||
| color: $text-heading-color; | ||
| } | ||
| h1, h2 { | ||
| margin: $small-margin 0; | ||
| h1, | ||
| h2 { | ||
| margin: $small-margin 0; | ||
| } | ||
| h3, h4, p { | ||
| margin: $middle-margin 0; | ||
| h3, | ||
| h4, | ||
| p { | ||
| margin: $middle-margin 0; | ||
| } | ||
| h5, h6 { | ||
| margin: $extrasmall-margin 0 0; | ||
| h5, | ||
| h6 { | ||
| margin: $extrasmall-margin 0 0; | ||
| } | ||
| strong { | ||
| font-weight: 700; | ||
| font-weight: 700; | ||
| } | ||
| ul, ol { | ||
| padding-bottom: $middle-margin; | ||
| padding-top: $middle-margin; | ||
| margin-left: $small-margin; | ||
| ul, | ||
| ol { | ||
| padding-bottom: $middle-margin; | ||
| padding-top: $middle-margin; | ||
| margin-left: $small-margin; | ||
| } | ||
| li { | ||
| font-size: $font-normal; | ||
| margin-left: 15px; | ||
| font-size: inherit; | ||
| margin-left: 15px; | ||
| } | ||
| ul { | ||
| li { | ||
| list-style: disc; | ||
| list-style-position: inside; | ||
| } | ||
| li { | ||
| list-style: disc; | ||
| list-style-position: inside; | ||
| } | ||
| } | ||
| ol { | ||
| li { | ||
| list-style: decimal; | ||
| list-style-position: inside; | ||
| } | ||
| li { | ||
| list-style: decimal; | ||
| list-style-position: inside; | ||
| } | ||
| } | ||
| a { | ||
| color: $rich-content-link-color; | ||
| text-decoration: underline; | ||
| font-size: 1em; | ||
| &:hover { | ||
| color: $rich-content-link-color-active; | ||
| } | ||
| color: $rich-content-link-color; | ||
| text-decoration: underline; | ||
| font-size: 1em; | ||
| &:hover { | ||
| color: $rich-content-link-color-active; | ||
| } | ||
| } | ||
| table { | ||
| height: auto !important; | ||
| border: 2px solid $border-gray; | ||
| &, tr, th, td { | ||
| border: solid 2px $border-gray; | ||
| background: $bg-basic-color; | ||
| border-collapse: collapse; | ||
| vertical-align: middle; | ||
| } | ||
| tr, th, td { | ||
| padding: 5px; | ||
| } | ||
| caption { | ||
| background-color: $bg-light-gray; | ||
| overflow: hidden; | ||
| padding: 10px; | ||
| font-size: $font-big; | ||
| font-weight: bold; | ||
| margin-left: 0; | ||
| } | ||
| tr { | ||
| border: none; | ||
| } | ||
| th, td { | ||
| border-width: 2px 0 0 2px; | ||
| } | ||
| th { | ||
| background-color: lighten($bg-light-gray, 5%); | ||
| font-size: $font-normal; | ||
| font-weight: bold; | ||
| padding: 7px; | ||
| &:first-child { | ||
| border-left: 0; | ||
| } | ||
| } | ||
| td { | ||
| &:first-child { | ||
| border-left: 0; | ||
| } | ||
| } | ||
| height: auto !important; | ||
| border: 2px solid $border-gray; | ||
| &, | ||
| tr, | ||
| th, | ||
| td { | ||
| border: solid 2px $border-gray; | ||
| background: $bg-basic-color; | ||
| border-collapse: collapse; | ||
| vertical-align: middle; | ||
| } | ||
| tr, | ||
| th, | ||
| td { | ||
| padding: 5px; | ||
| } | ||
| caption { | ||
| background-color: $bg-light-gray; | ||
| overflow: hidden; | ||
| padding: 10px; | ||
| font-size: $font-big; | ||
| font-weight: bold; | ||
| margin-left: 0; | ||
| } | ||
| tr { | ||
| border: none; | ||
| } | ||
| th, | ||
| td { | ||
| border-width: 2px 0 0 2px; | ||
| } | ||
| th { | ||
| background-color: lighten($bg-light-gray, 5%); | ||
| font-size: $font-normal; | ||
| font-weight: bold; | ||
| padding: 7px; | ||
| &:first-child { | ||
| border-left: 0; | ||
| } | ||
| } | ||
| td { | ||
| &:first-child { | ||
| border-left: 0; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.