1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00

updated glyphs, accordion pieces ok

This commit is contained in:
diminator 2015-10-09 13:14:29 +02:00
parent 85d3184e98
commit dc8599830b
18 changed files with 178 additions and 295 deletions

BIN
fonts/ascribe-logo.eot Normal file

Binary file not shown.

View File

@ -3,9 +3,13 @@
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="ascribe-logo-v2" horiz-adv-x="1024">
<font id="ascribe-logo" horiz-adv-x="1024">
<font-face units-per-em="1024" ascent="960" descent="-64" />
<missing-glyph horiz-adv-x="1024" />
<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
<glyph unicode="&#xe800;" glyph-name="ascribe-logo" horiz-adv-x="4195" d="M499.718 326.19c0 109.528-24.641 157.448-61.607 198.517-38.336 41.077-95.832 71.191-191.673 71.191-95.832 0-171.135-36.957-212.212-64.34l27.382-52.031c13.695 10.954 88.998 54.764 187.571 54.764 99.943 0 177.978-57.505 177.978-173.876v-34.225l-173.876-6.843c-171.135-6.852-253.281-82.146-253.281-191.673s88.989-191.674 212.212-191.674c123.214 0 191.674 75.294 214.944 102.676v-88.989h72.562v376.503zM427.156 113.978c-30.114-47.92-98.573-116.371-201.258-116.371-102.676 0-154.707 61.607-154.707 130.066 0 68.45 42.448 125.955 175.246 132.798l180.719 10.955v-157.448zM1063.784 123.562c0 120.482-119.12 161.551-198.525 188.933-78.035 27.382-146.494 56.134-146.494 121.853s50.661 101.314 121.853 101.314c71.191 0 115.001-24.641 158.819-72.561l43.809 43.809c-49.291 56.134-106.795 88.989-199.887 88.989-93.1 0-193.044-54.764-193.044-169.765s119.112-156.078 173.876-175.246c54.764-19.168 168.394-47.92 168.394-130.066s-69.821-120.482-149.226-120.482c-79.413 0-142.391 39.707-183.46 99.952l-50.661-41.077c39.707-65.718 113.639-123.215 231.38-123.215s223.166 68.451 223.166 187.562v0zM1679.873 93.44c0 0-68.451-93.1-212.212-93.1-143.753 0-242.326 113.639-242.326 271.087s112.268 260.132 239.594 260.132c125.955 0 180.719-61.616 208.101-93.1l45.18 47.912c-13.687 17.798-82.146 109.528-250.548 109.528-167.024 0-317.628-132.798-317.628-328.583 0-194.406 139.65-331.315 310.785-331.315s236.853 82.146 260.133 109.528l-41.077 47.912zM2142.607 586.323c0 0-27.382 9.576-68.45 9.576-68.459 0-138.28-43.81-161.551-130.058v119.112h-71.2v-635.266h71.2v342.278c0 109.528 34.225 162.921 45.18 177.978 10.946 15.066 47.912 57.505 109.528 57.505 34.225 0 53.394-5.473 68.451-10.955l6.843 69.83zM2353.432 810.851c0 32.855-26.012 58.875-58.867 58.875-32.863 0-58.875-26.020-58.875-58.875s26.011-58.875 58.875-58.875c32.855 0 58.867 26.020 58.867 58.875v0zM2330.161 584.953h-71.191v-635.266h71.191v635.266zM3144.767 267.315c0 188.941-123.223 328.583-312.155 328.583-91.73 0-177.987-36.957-239.594-132.798v431.267h-71.191v-944.68h71.191v120.482c53.394-93.1 141.012-134.169 236.853-134.169 191.673 0 314.896 143.753 314.896 331.315v0zM3069.464 267.315c0-146.494-86.257-266.976-239.594-266.976-154.707 0-239.594 120.482-239.594 266.976 0 147.864 84.887 266.976 239.594 266.976 153.337 0 239.594-119.112 239.594-266.976v0zM3836.158 298.808c0 171.135-120.482 297.090-287.514 297.090-168.402 0-308.044-132.798-308.044-328.583 0-194.406 119.112-331.315 303.933-331.315 184.83 0 264.244 95.833 264.244 95.833l-34.234 50.661c0 0-79.405-82.154-223.158-82.154-143.761 0-228.64 99.952-235.491 250.548h516.154c0 0 4.111 27.382 4.111 47.92v0zM3318.633 312.495c4.111 88.998 68.459 221.796 225.899 221.796 157.449 0 219.065-139.65 219.065-221.796h-444.963zM4027.755 897.194h-26.663l-88.15-217.077h31.998l22.269 56.468h92.852l22.277-56.468h33.874l-88.457 217.077zM3975.68 761.989l37.96 97.245 37.951-97.245h-75.91zM4195.326 778.878c0 101.246-79.876 181.122-181.121 181.122s-181.122-79.876-181.122-181.122c0-101.245 79.876-181.122 181.122-181.122s181.121 79.876 181.121 181.122v0zM4173.452 778.878c0-87.002-72.254-159.247-159.247-159.247-87.002 0-159.246 72.245-159.246 159.247s72.244 159.247 159.246 159.247c86.993 0 159.247-72.245 159.247-159.247v0z" />
<glyph unicode="&#xe800;" glyph-name="sort" d="M367 832v-749h16v749h-16zM298.66 192.586c3.719 2.375 8.672 1.273 11.046-2.453l65.75-103.241 65.751 103.241c2.374 3.727 7.327 4.828 11.046 2.453s4.798-7.352 2.454-11.047l-72.501-113.837c-1.469-2.304-4.016-3.702-6.75-3.702s-5.28 1.398-6.75 3.702l-72.5 113.837c-0.844 1.328-1.25 2.82-1.25 4.289 0 2.641 1.312 5.227 3.704 6.758zM641 813v-749h16v749h-16zM725.341 703.414c-3.719-2.375-8.672-1.273-11.047 2.453l-65.75 103.241-65.75-103.241c-2.375-3.727-7.328-4.828-11.047-2.453s-4.797 7.352-2.453 11.047l72.5 113.837c1.469 2.304 4.016 3.702 6.75 3.702s5.281-1.398 6.75-3.702l72.5-113.837c0.844-1.328 1.25-2.82 1.25-4.289 0-2.641-1.312-5.227-3.703-6.758z" />
<glyph unicode="&#xe801;" glyph-name="filter" horiz-adv-x="1017" d="M20.139 960c-7.196 0-14.033-5.35-17.787-11.434-0.125-0.203 0.117-1.064 0-1.27-4.192-7.668-2.163-15.174 1.27-20.328v-1.27l373.519-501.836v-466.263c0-6.020 5.695-11.214 11.434-15.246l-2.541-2.541c1.964-1.969 2.214-0.665 3.811-1.27 0.479-0.183 0.834 0.102 1.27 0 0.398-0.13-0.417-1.166 0-1.27 2.246-0.413 5.765-1.27 6.352-1.27 5.57 0 11.844 2.954 15.246 6.352l176.596 176.596c3.409 3.404 6.352 9.681 6.352 15.246v283.315l416.715 508.189v1.27c3.654 5.479 6.566 13.552 2.541 21.598l-1.27 1.27c-3.651 5.48-9.991 10.164-17.787 10.164h-975.722zM20.139 939.672h975.722c0.195-0.386 0.069-1.023 0-1.27v-1.27l-417.985-509.459-2.541-2.541v-290.938c0-1.051-0.268-0.268-1.27-1.27l-175.325-176.596c-0.114-0.114-1.711 0-1.27 0v475.156l-2.541 2.541-374.789 503.107v1.27c0.994 1.988-1.023 1.27 0 1.27z" />
<glyph unicode="&#xe802;" glyph-name="search" d="M438.169 960c-241.738 0-438.169-196.431-438.169-438.169s196.431-438.169 438.169-438.169c241.738 0 438.169 196.431 438.169 438.169s-196.431 438.169-438.169 438.169zM438.169 934.32c227.859 0 412.489-184.63 412.489-412.489s-184.63-412.489-412.489-412.489c-227.859 0-412.489 184.63-412.489 412.489s184.63 412.489 412.489 412.489zM747.937 229.718l-17.655-17.655 274.458-276.063 19.26 19.26-276.063 274.458z" />
<glyph unicode="&#xe803;" glyph-name="ascribe-icon" d="M550.306 782.458h-75.373l-249.184-613.64h90.453l62.951 159.627h262.477l62.974-159.627h95.755l-250.053 613.64zM403.098 400.255l107.305 274.897 107.28-274.897h-214.586zM1024 448c0 286.204-225.796 512-511.999 512s-512.001-225.796-512.001-512c0-286.204 225.797-512 512.001-512s511.999 225.797 511.999 512v0zM962.165 448c0-245.94-204.249-450.164-450.164-450.164-245.941 0-450.161 204.224-450.161 450.164s204.221 450.164 450.161 450.164c245.915 0 450.164-204.224 450.164-450.164v0z" />
<glyph unicode="&#xe804;" glyph-name="ascribe-logo" horiz-adv-x="4195" d="M499.718 326.19c0 109.528-24.641 157.448-61.607 198.517-38.336 41.077-95.832 71.191-191.673 71.191-95.832 0-171.135-36.957-212.212-64.34l27.382-52.031c13.695 10.954 88.998 54.764 187.571 54.764 99.943 0 177.978-57.505 177.978-173.876v-34.225l-173.876-6.843c-171.135-6.852-253.281-82.146-253.281-191.673s88.989-191.674 212.212-191.674c123.214 0 191.674 75.294 214.944 102.676v-88.989h72.562v376.503zM427.156 113.978c-30.114-47.92-98.573-116.371-201.258-116.371-102.676 0-154.707 61.607-154.707 130.066 0 68.45 42.448 125.955 175.246 132.798l180.719 10.955v-157.448zM1063.784 123.562c0 120.482-119.12 161.551-198.525 188.933-78.035 27.382-146.494 56.134-146.494 121.853s50.661 101.314 121.853 101.314c71.191 0 115.001-24.641 158.819-72.561l43.809 43.809c-49.291 56.134-106.795 88.989-199.887 88.989-93.1 0-193.044-54.764-193.044-169.765s119.112-156.078 173.876-175.246c54.764-19.168 168.394-47.92 168.394-130.066s-69.821-120.482-149.226-120.482c-79.413 0-142.391 39.707-183.46 99.952l-50.661-41.077c39.707-65.718 113.639-123.215 231.38-123.215s223.166 68.451 223.166 187.562v0zM1679.873 93.44c0 0-68.451-93.1-212.212-93.1-143.753 0-242.326 113.639-242.326 271.087s112.268 260.132 239.594 260.132c125.955 0 180.719-61.616 208.101-93.1l45.18 47.912c-13.687 17.798-82.146 109.528-250.548 109.528-167.024 0-317.628-132.798-317.628-328.583 0-194.406 139.65-331.315 310.785-331.315s236.853 82.146 260.133 109.528l-41.077 47.912zM2142.607 586.323c0 0-27.382 9.576-68.45 9.576-68.459 0-138.28-43.81-161.551-130.058v119.112h-71.2v-635.266h71.2v342.278c0 109.528 34.225 162.921 45.18 177.978 10.946 15.066 47.912 57.505 109.528 57.505 34.225 0 53.394-5.473 68.451-10.955l6.843 69.83zM2353.432 810.851c0 32.855-26.012 58.875-58.867 58.875-32.863 0-58.875-26.020-58.875-58.875s26.011-58.875 58.875-58.875c32.855 0 58.867 26.020 58.867 58.875v0zM2330.161 584.953h-71.191v-635.266h71.191v635.266zM3144.767 267.315c0 188.941-123.223 328.583-312.155 328.583-91.73 0-177.987-36.957-239.594-132.798v431.267h-71.191v-944.68h71.191v120.482c53.394-93.1 141.012-134.169 236.853-134.169 191.673 0 314.896 143.753 314.896 331.315v0zM3069.464 267.315c0-146.494-86.257-266.976-239.594-266.976-154.707 0-239.594 120.482-239.594 266.976 0 147.864 84.887 266.976 239.594 266.976 153.337 0 239.594-119.112 239.594-266.976v0zM3836.158 298.808c0 171.135-120.482 297.090-287.514 297.090-168.402 0-308.044-132.798-308.044-328.583 0-194.406 119.112-331.315 303.933-331.315 184.83 0 264.244 95.833 264.244 95.833l-34.234 50.661c0 0-79.405-82.154-223.158-82.154-143.761 0-228.64 99.952-235.491 250.548h516.154c0 0 4.111 27.382 4.111 47.92v0zM3318.633 312.495c4.111 88.998 68.459 221.796 225.899 221.796 157.449 0 219.065-139.65 219.065-221.796h-444.963zM4027.755 897.194h-26.663l-88.15-217.077h31.998l22.269 56.468h92.852l22.277-56.468h33.874l-88.457 217.077zM3975.68 761.989l37.96 97.245 37.951-97.245h-75.91zM4195.326 778.878c0 101.246-79.876 181.122-181.121 181.122s-181.122-79.876-181.122-181.122c0-101.245 79.876-181.122 181.122-181.122s181.121 79.876 181.121 181.122v0zM4173.452 778.878c0-87.002-72.254-159.247-159.247-159.247-87.002 0-159.246 72.245-159.246 159.247s72.244 159.247 159.246 159.247c86.993 0 159.247-72.245 159.247-159.247v0z" />
</font></defs></svg>

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
fonts/ascribe-logo.ttf Normal file

Binary file not shown.

BIN
fonts/ascribe-logo.woff Normal file

Binary file not shown.

View File

@ -29,21 +29,26 @@ let AccordionListItem = React.createClass({
<div className="row">
<div className={this.props.className}>
<div className="wrapper">
<Link {...this.props.linkData()}>
<div className="pull-left">
<div className="thumbnail-wrapper">
{this.props.thumbnail}
<Link {...this.props.linkData()}>
<div className="thumbnail-wrapper">
{this.props.thumbnail}
</div>
</Link>
</div>
<div className="accordion-list-item-header">
<Link {...this.props.linkData()}>
{this.props.heading}
</Link>
<Link {...this.props.linkData()}>
{this.props.subheading}
{this.props.subsubheading}
</Link>
<div className="accordion-list-item-buttons">
{this.props.buttons}
</div>
</div>
<div className="pull-left accordion-list-item-header">
{this.props.heading}
{this.props.subheading}
{this.props.subsubheading}
</div>
</Link>
<div className="accordion-list-item-buttons">
{this.props.buttons}
</div>
<span style={{'clear': 'both'}}></span>
<div className="request-action-badge">

View File

@ -68,7 +68,7 @@ let PieceListToolbar = React.createClass({
},
render() {
let searchIcon = <Glyphicon glyph='search' className="filter-glyph"/>;
let searchIcon = <span className="ascribe-icon icon-ascribe-search"/>;
return (
<div className={this.props.className}>
@ -78,6 +78,10 @@ let PieceListToolbar = React.createClass({
<span className="pull-left">
{this.props.children}
</span>
<span className="pull-right">
{this.getOrderWidget()}
{this.getFilterWidget()}
</span>
<span className="pull-right search-bar ascribe-input-glyph">
<Input
type='text'
@ -86,10 +90,7 @@ let PieceListToolbar = React.createClass({
onChange={this.searchFor}
addonAfter={searchIcon} />
</span>
<span className="pull-right">
{this.getOrderWidget()}
{this.getFilterWidget()}
</span>
</div>
</div>
</div>

View File

@ -76,7 +76,7 @@ let PieceListToolbarFilterWidgetFilter = React.createClass({
render() {
let filterIcon = (
<span>
<span className="glyphicon glyphicon-filter" aria-hidden="true"></span>
<span className="ascribe-icon icon-ascribe-filter" aria-hidden="true"></span>
<span style={this.isFilterActive()}>*</span>
</span>
);

View File

@ -47,8 +47,8 @@ let PieceListToolbarOrderWidget = React.createClass({
render() {
let filterIcon = (
<span>
<span className="glyphicon glyphicon-sort-by-alphabet" aria-hidden="true"></span>
<span style={this.isOrderActive()}>*</span>
<span className="ascribe-icon icon-ascribe-sort" aria-hidden="true"></span>
<span style={this.isOrderActive()}>&middot;</span>
</span>
);
return (

View File

@ -184,7 +184,7 @@ let AccordionListItemPrize = React.createClass({
piece={this.props.content}
artistName={artistName}
subsubheading={
<div className="pull-left">
<div>
<span>{this.props.content.date_created.split('-')[0]}</span>
</div>}
buttons={this.getPrizeButtons()}

View File

@ -24,18 +24,18 @@
}
@font-face {
font-family: 'ascribe-logo-v2';
src:url('#{$BASE_URL}static/fonts/ascribe-logo-v2.eot?8e00ie');
src:url('#{$BASE_URL}static/fonts/ascribe-logo-v2.eot?8e00ie#iefix') format('embedded-opentype'),
url('#{$BASE_URL}static/fonts/ascribe-logo-v2.ttf?8e00ie') format('truetype'),
url('#{$BASE_URL}static/fonts/ascribe-logo-v2.woff?8e00ie') format('woff'),
url('#{$BASE_URL}static/fonts/ascribe-logo-v2.svg?8e00ie#ascribe-logo-v2') format('svg');
font-family: 'ascribe-logo';
src:url('#{$BASE_URL}static/fonts/ascribe-logo.eot?qdbpt8');
src:url('#{$BASE_URL}static/fonts/ascribe-logo.eot?qdbpt8#iefix') format('embedded-opentype'),
url('#{$BASE_URL}static/fonts/ascribe-logo.ttf?qdbpt8') format('truetype'),
url('#{$BASE_URL}static/fonts/ascribe-logo.woff?qdbpt8') format('woff'),
url('#{$BASE_URL}static/fonts/ascribe-logo.svg?qdbpt8#ascribe-logo') format('svg');
font-weight: normal;
font-style: normal;
}
[class^="icon-"], [class*=" icon-"] {
font-family: 'ascribe-logo-v2';
[class^="icon-ascribe-"], [class*=" icon-ascribe-"] {
font-family: 'ascribe-logo';
speak: none;
font-style: normal;
font-weight: normal;
@ -48,9 +48,21 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-ascribe-logo:before {
.icon-ascribe-sort:before {
content: "\e800";
}
.icon-ascribe-filter:before {
content: "\e801";
}
.icon-ascribe-search:before {
content: "\e802";
}
.icon-ascribe-logo-short:before {
content: "\e803";
}
.icon-ascribe-logo:before {
content: "\e804";
}
.glyph-ascribe-logo-spool:before {

View File

@ -1,193 +0,0 @@
@font-face {
font-family: 'ascribe';
src:url('../../fonts/ascribe.eot?-6bb2dq');
src:url('../../fonts/ascribe.eot?#iefix-6bb2dq') format('embedded-opentype'),
url('../../fonts/ascribe.woff?-6bb2dq') format('woff'),
url('../../fonts/ascribe.ttf?-6bb2dq') format('truetype'),
url('../../fonts/ascribe.svg?-6bb2dq#ascribe') format('svg');
font-weight: normal;
font-style: normal;
}
[class^="glyph-ascribe-"], [class*=" glyph-ascribe-"] {
font-family: 'ascribe';
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.glyph-ascribe-ascribe-spool:before {
content: "\e600";
}
.glyph-ascribe-spool:before {
content: "\e601";
}
.glyph-ascribe-ascribe-spool-chunked:before {
content: "\e602";
}
.glyph-ascribe-spool-chunked:before {
content: "\e603";
}
.glyph-ascribe-home:before {
content: "\e900";
}
.glyph-ascribe-home2:before {
content: "\e901";
}
.glyph-ascribe-home3:before {
content: "\e902";
}
.glyph-ascribe-pencil:before {
content: "\e905";
}
.glyph-ascribe-pencil2:before {
content: "\e906";
}
.glyph-ascribe-quill:before {
content: "\e907";
}
.glyph-ascribe-image:before {
content: "\e90d";
}
.glyph-ascribe-camera:before {
content: "\e90f";
}
.glyph-ascribe-music:before {
content: "\e911";
}
.glyph-ascribe-play:before {
content: "\e912";
}
.glyph-ascribe-film:before {
content: "\e913";
}
.glyph-ascribe-credit-card:before {
content: "\e93f";
}
.glyph-ascribe-pushpin:before {
content: "\e946";
}
.glyph-ascribe-undo2:before {
content: "\e967";
}
.glyph-ascribe-redo2:before {
content: "\e968";
}
.glyph-ascribe-enlarge:before {
content: "\e989";
}
.glyph-ascribe-shrink:before {
content: "\e98a";
}
.glyph-ascribe-enlarge2:before {
content: "\e98b";
}
.glyph-ascribe-shrink2:before {
content: "\e98c";
}
.glyph-ascribe-share:before {
content: "\ea7d";
}
.glyph-ascribe-new-tab:before {
content: "\ea7e";
}
.glyph-ascribe-share2:before {
content: "\ea82";
}
.glyph-ascribe-google:before {
content: "\ea87";
}
.glyph-ascribe-google-plus:before {
content: "\ea88";
}
.glyph-ascribe-google-plus2:before {
content: "\ea89";
}
.glyph-ascribe-facebook:before {
content: "\ea8c";
}
.glyph-ascribe-facebook2:before {
content: "\ea8d";
}
.glyph-ascribe-twitter:before {
content: "\ea91";
}
.glyph-ascribe-twitter2:before {
content: "\ea92";
}
.glyph-ascribe-youtube3:before {
content: "\ea99";
}
.glyph-ascribe-dropbox:before {
content: "\eaaf";
}
.glyph-ascribe-file-pdf:before {
content: "\eada";
}
.glyph-ascribe-chrome:before {
content: "\eae5";
}
.glyph-ascribe-firefox:before {
content: "\eae6";
}
.glyph-ascribe-IE:before {
content: "\eae7";
}
.glyph-ascribe-opera:before {
content: "\eae8";
}
.glyph-ascribe-safari:before {
content: "\eae9";
}
.btn-glyph-ascribe{
font-size: 18px;
padding: 4px 12px 0 10px
}

View File

@ -77,9 +77,9 @@ $ascribe-accordion-list-item-height: 100px;
white-space: nowrap;
}
a:not(.btn) {
color: #666;
}
a {
text-decoration: none
};
}
}
@ -96,14 +96,17 @@ $ascribe-accordion-list-item-height: 100px;
margin-top: 0.4em;
}
> a {
text-decoration: none;
}
}
.accordion-list-item-buttons {
padding-top: 60px;
padding-right: 10px;
position: absolute;
right: 1em;
bottom: 1em;
@media (max-width: 400px) {
right: 0;
bottom: 0;
}
}
.ascribe-accordion-list-loading img {

View File

@ -4,6 +4,7 @@ $ascribe-blue: #65CFE9;
$ascribe-light-blue: #D3DEE4;
$ascribe-white: #F8F8F8;
$ascribe-pink: #D10074;
$ascribe-blue-border: rgba(0, 60, 105, 0.1);
$ascribe--fg-color: $ascribe-dark-blue;
$ascribe--bg-color: $ascribe-dark-blue;
@ -11,7 +12,9 @@ $ascribe--bg-color: $ascribe-dark-blue;
$ascribe--nav-fg-prim-color: white;
$ascribe--nav-fg-sec-color: $ascribe-light-blue;
$ascribe--nav-bg-color: $ascribe-dark-blue;
$ascribe--button-color: $ascribe--bg-color;
$ascribe--button-default-color: $ascribe--bg-color;
$ascribe--button-secondary-color: $ascribe--bg-color;
$ascribe--font-weight: 300;
$ascribe--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ikono_tv.png';
$ascribe--font: 'canada-type-gibson';
@ -21,7 +24,7 @@ body {
//font-family: 'Helvetica Neue', 'Helvetica', sans-serif;
font-family: 'canada-type-gibson', sans-serif !important;
font-weight: $ascribe--font-weight !important;
background-color: #f9f9f9 !important;
background-color: #fcfcfc !important;
}
h1, h3 {
font-family: 'canada-type-gibson', sans-serif !important;
@ -40,8 +43,9 @@ h1 {
.navbar-default {
background-color: $ascribe--nav-bg-color;
box-shadow: 0 0 4px rgba(0,0,0,.14),
0 4px 8px rgba(0,0,0,.28);
box-shadow: 0 0 2px rgba(0,0,0,.14),
0 2px 4px rgba(0,0,0,.28);
//box-shadow: 0 2px 2px -2px rgba(0, 0, 0, .52);
.navbar-nav > li > a,
.navbar-nav > li > .active a {
@ -68,10 +72,6 @@ h1 {
background-color: $ascribe--nav-bg-color;
}
.navbar-toggle .icon-bar {
background-color: $ascribe--nav-bg-color;
}
.navbar-nav > .open > a,
.navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus,
@ -129,31 +129,61 @@ h1 {
position: relative;
}
.navbar-toggle .icon-bar {
background-color: $ascribe--nav-fg-prim-color;
}
.navbar-toggle:hover,
.navbar-toggle:focus {
background-color: $ascribe--nav-bg-color;
}
}
.ascribe-icon {
font-size: 1.2em;
font-weight: 800;
}
.ascribe-accordion-list-item {
border: 1px solid rgba(0, 60, 105, 0.1);
-webkit-box-shadow: 0 2px 2px -2px rgba(0,0,0,.58);
-moz-box-shadow: 0 2px 2px -2px rgba(0,0,0,.58);
box-shadow: 0 2px 2px -2px rgba(0,0,0,.58);
border: 1px solid $ascribe-blue-border;
-webkit-box-shadow: 0 2px 2px -2px rgba(0,0,0,.18);
-moz-box-shadow: 0 2px 2px -2px rgba(0,0,0,.18);
box-shadow: 0 2px 2px -2px rgba(0,0,0,.18);
&:hover {
-webkit-transform: scale(1.02);
-moz-transform: scale(1.02);
-ms-transform: scale(1.02);
-o-transform: scale(1.02);
transform: scale(1.02);
-webkit-transition: all 0.2s ease;
-moz-transition: all 0.2s ease;
-o-transition: all 0.2s ease;
-ms-transition: all 0.2s ease;
transition: all 0.2s ease;
//-webkit-transform: scale(1.005);
// -moz-transform: scale(1.005);
// -ms-transform: scale(1.005);
// -o-transform: scale(1.005);
// transform: scale(1.005);
// -webkit-transition: all 0.1s ease;
// -moz-transition: all 0.1s ease;
// -o-transition: all 0.1s ease;
//-ms-transition: all 0.1s ease;
// transition: all 0.1s ease;
}
}
.ascribe-accordion-list-item .wrapper {
h1 {
font-size: 1.6em;
margin: .4em 0 0 0;
}
h3 {
font-size: 1.1em;
margin-bottom: 0.4em;
}
a:not(.btn) {
color: $ascribe-black
}
.accordion-list-item-header {
a div {
color: rgba(0,0,0,.6)
}
}
}
.ascribe-footer {
position: fixed;
left: 0;
@ -190,7 +220,7 @@ h1 {
}
.ascribe-btn-login-spinner {
background-color: $ascribe--button-color;
background-color: $ascribe--button-default-color;
}
.ascribe-form-header {
@ -290,8 +320,8 @@ fieldset[disabled] .btn-default:focus,
fieldset[disabled] .btn-default.focus,
fieldset[disabled] .btn-default:active,
fieldset[disabled] .btn-default.active {
background-color: darken($ascribe--button-color, 20%);
border-color: darken($ascribe--button-color, 20%);
background-color: darken($ascribe--button-default-color, 20%);
border-color: darken($ascribe--button-default-color, 20%);
}
// buttons!
@ -300,20 +330,20 @@ fieldset[disabled] .btn-default.active {
.ascribe-piece-list-toolbar-filter-widget button {
background-color: transparent;
border: 1px solid transparent;
color: $ascribe--button-color;
color: $ascribe--button-default-color;
&:hover,
&:active {
background-color: $ascribe--button-color !important;
border-color: $ascribe--button-color !important;
background-color: $ascribe--button-default-color !important;
border-color: $ascribe--button-default-color !important;
color: white;
}
}
.ascribe-btn-login,
.btn-default {
background-color: $ascribe--button-color;
border-color: $ascribe--button-color;
background-color: $ascribe--button-default-color;
border-color: $ascribe--button-default-color;
&:hover,
&:active,
@ -324,15 +354,15 @@ fieldset[disabled] .btn-default.active {
&.active:hover,
&.active:focus,
&.active.focus {
background-color: darken($ascribe--button-color, 20%);
border-color: darken($ascribe--button-color, 20%);
background-color: darken($ascribe--button-default-color, 20%);
border-color: darken($ascribe--button-default-color, 20%);
}
}
.btn-secondary {
background-color: white;
border-color: $ascribe--button-color;
color: $ascribe--button-color;
border-color: $ascribe--button-secondary-color;
color: $ascribe--button-secondary-color;
&:hover,
&:active,
@ -343,8 +373,8 @@ fieldset[disabled] .btn-default.active {
&.active:hover,
&.active:focus,
&.active.focus {
background-color: darken($ascribe--button-color, 20%);
border-color: darken($ascribe--button-color, 20%);
background-color: darken($ascribe--button-secondary-color, 20%);
border-color: darken($ascribe--button-secondary-color, 20%);
}
}
@ -352,58 +382,84 @@ fieldset[disabled] .btn-default.active {
.open > .btn-default.dropdown-toggle:focus,
.open > .btn-default.dropdown-toggle.focus,
.open > .btn-default.dropdown-toggle.dropdown-toggle {
background-color: darken($ascribe--button-color, 20%);
border-color: darken($ascribe--button-color, 20%);
background-color: darken($ascribe--button-secondary-color, 20%);
border-color: darken($ascribe--button-secondary-color, 20%);
}
.pager li > a, .pager li > span {
background-color: $ascribe--button-color;
border-color: $ascribe--button-color;
background-color: $ascribe--button-default-color;
border-color: $ascribe--button-default-color;
}
// inputs!
.ascribe-input-glyph > .form-group > .input-group > .input-group-addon > .filter-glyph {
color: $ascribe--button-color;
color: $ascribe--button-default-color;
}
.ascribe-input-glyph > .form-group > .input-group > .input-group-addon,
.ascribe-input-glyph > .form-group > .input-group input {
border-color: $ascribe--button-color;
.search-bar > .form-group > .input-group {
border: 1px solid rgba(0, 0, 0, 0);
&:hover, &:focus, &:active {
border-color: $ascribe-blue-border;
}
input::-webkit-input-placeholder {
color: rgba($ascribe-dark-blue, 0.5);
font-style: normal;
}
input::-moz-placeholder {
color: rgba($ascribe-dark-blue, 0.5);
font-style: normal;
}
/* firefox 19+ */
input:-ms-input-placeholder {
color: rgba($ascribe-dark-blue, 0.5);
font-style: normal;
}
/* ie */
input:-moz-placeholder {
color: rgba($ascribe-dark-blue, 0.5);
font-style: normal;
}
//input::-webkit-input-placeholder { color:transparent }
//input::-moz-placeholder { color:transparent; } /* firefox 19+ */
//input:-ms-input-placeholder { color:transparent; } /* ie */
//input:-moz-placeholder { color:transparent; }
}
.ascribe-settings-property-collapsible-toggle [type=checkbox]:checked + .checkbox:before,
.ascribe-checkbox-wrapper [type=checkbox]:checked + .checkbox:before {
color: $ascribe--button-color;
color: $ascribe--button-default-color;
}
// properties!
.is-focused {
border-left-color: $ascribe--button-color !important;
background-color: rgba($ascribe--button-color, .05);
border-left-color: $ascribe--button-default-color !important;
background-color: rgba($ascribe--button-default-color, .05);
}
.ascribe-settings-wrapper:hover {
border-left-color: rgba($ascribe--button-color, .5);
border-left-color: rgba($ascribe--button-default-color, .5);
}
.ascribe-accordion-list-item .wrapper:hover {
background-color: rgba($ascribe--button-color, .05);
background-color: rgba($ascribe--button-default-color, .05);
}
// intercom stuff
#intercom-container .intercom-launcher-button {
background-color: $ascribe--button-color !important;
border-color: $ascribe--button-color !important;
background-color: $ascribe--button-default-color !important;
border-color: $ascribe--button-default-color !important;
}
// notifications
.ascribe-global-notification-success {
background-color: $ascribe--button-color;
background-color: $ascribe--button-default-color;
}
// progress bar
.ascribe-progress-bar > .progress-bar {
background-color: $ascribe--button-color;
background-color: $ascribe--button-default-color;
}

View File

@ -14,23 +14,19 @@
.ascribe-input-glyph > .form-group > .input-group {
margin-left: 6px;
border: none;
input {
background-color: transparent;
border: 1px solid #02b6a3;
border-right: 0;
box-shadow: none;
border: none;
}
> .input-group-addon {
background-color: transparent;
> .filter-glyph {
color: #02b6a3;
border: none;
}
border: 1px solid #02b6a3;
border-left: 0;
}
}
@ -45,7 +41,6 @@
&:hover,
&:active {
background-color: #02b6a3 !important;
border: 1px solid #02b6a3 !important;
color: white;
}
.caret {

View File

@ -221,7 +221,7 @@ $legend-border-color: #e5e5e5 !default;
//** Background color for textual input addons
$input-group-addon-bg: $ascribe-color-green !default;
//** Border color for textual input addons
$input-group-addon-border-color: $ascribe-color-green !default;
$input-group-addon-border-color: transparent !default;
//** Disabled cursor for form controls and buttons.
$cursor-disabled: not-allowed !default;