Skip to content
This repository has been archived by the owner on May 22, 2023. It is now read-only.

Commit

Permalink
(#7) Extracted most styles into laxar_demo.theme
Browse files Browse the repository at this point in the history
  • Loading branch information
x1B committed Nov 11, 2014
1 parent 8122eff commit 80306ab
Show file tree
Hide file tree
Showing 32 changed files with 11,192 additions and 360 deletions.
13 changes: 7 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@

## Last Changes

- [#4] (https://github.com/LaxarJS/shop_demo/issues/4): Bug: Removed duplicate data-ax-widget-area
- [#3] (https://github.com/LaxarJS/shop_demo/issues/3): Styling: Added support for retina images
- [#2] (https://github.com/LaxarJS/shop_demo/issues/2): Styling: Fixed add button is not usable for small viewports. Some further improvements."
- [#7] (https://github.com/LaxarJS/shop_demo/issues/7): Styling: extracted laxar demo theme.
- [#4] (https://github.com/LaxarJS/shop_demo/issues/4): Bug: Removed duplicate data-ax-widget-area
- [#3] (https://github.com/LaxarJS/shop_demo/issues/3): Styling: Added support for retina images
- [#2] (https://github.com/LaxarJS/shop_demo/issues/2): Styling: Fixed add button is not usable for small viewports. Some further improvements."


## v1.2.0

- [#1](https://github.com/LaxarJS/shop_demo/issues/1): Refactored styling
- [#1](https://github.com/LaxarJS/shop_demo/issues/1): Refactored styling


## v1.1.0

- Added HeadlineWidget to header of pages
- Revised tutorials
- Added HeadlineWidget to header of pages
- Revised tutorials
7 changes: 4 additions & 3 deletions application/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ window.laxar = {
name: 'LaxarJS ShopDemo',
description: 'A DemoApp to learn how LaxarJS works.',

theme: 'default',
portal: {
theme: 'laxar_demo'
},

locales: {
'default': 'en_US',
'alternative': 'de_DE'
'default': 'en_US'
},

logThreshold: 'DEVELOP',
Expand Down
235 changes: 32 additions & 203 deletions application/layouts/application/default.theme/css/application.css
Original file line number Diff line number Diff line change
@@ -1,220 +1,49 @@
@import url(http://fonts.googleapis.com/css?family=Exo+2:500,200);

html,
body {
padding: 0;
margin: 0;
}

body {
background: url(../images/bg_header_shadow.png) no-repeat center 115px #e9ebed;
}

body:before {
content: "";
position: absolute;
top: 0;
left: 0;
right: 0;
height: 115px;
background: #fff;
border-bottom: 1px solid #D3D3D3;
}

.container {
position: relative;
}

.app-header,
.app-content-wrapper {
position: absolute;
left: 0;
right: 0;
}

.app-header {
top: 0;
height: 60px;
padding-top: 27px;
padding-bottom: 27px;
}

.app-header .form-group {
margin-top: 15px;
margin-bottom: 0;
line-height: 1;
}

.app-header h1 {
margin: 0;
position: relative;
bottom: 2px;
float: right;
width: auto;
font-size: 55px;
font-family: "Exo 2", Arial, sans-serif;
font-weight: 500;
color: #737373;
line-height: 1;
}

.app-header h1 span {
font-weight: 200;
}

.app-content-wrapper {
top: 155px;
}

.app-content {
background-color: white;
padding: 20px;
border: 1px solid #d3d3d3;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
border-radius: 0 50px 0 0;
}

h1 {
color: #8c8c8c;
font-family: 'Exo 2', Arial, sans-serif;
}

h3 {
color: #ccc;
line-height: 50px;
height: 50px;
font-family: 'Exo 2', Arial, sans-serif;
margin-top: 0;
margin-bottom: 1em;
}

h3 .fa {
font-size: 30px;
background-color: #ccc;
color: white;
width: 50px;
height: 50px;
line-height: 50px;
border-radius: 50px;
text-align: center;
margin-right: 0.2em;
}

a:hover,
a:focus {
text-decoration: none;
}

[disabled],
.ax-disabled {
color: #ccc !important;
}

.table {
border: 1px solid #ddd;
border-radius: 4px 4px 0 0;
border-collapse: separate;
}

.table th {
background-color: #ddd;
border: none !important;
.app-footer {
margin-top: 20px;
}

.app-logo {
display: block;
height: 60px;
width: 257px;
background: url("../images/laxarjs_logo.png") no-repeat right/100%;
}

.app-no-selection,
.app-no-articles {
color: #ec5e6d;
text-shadow: 1px 1px 0px #fce7e9;
display: block;
height: 60px;
width: 257px;
background: url("../../default.theme/images/laxarjs_logo.png") no-repeat right/100%;
}

.app-flower {
float: right;
margin-top: 40px;
margin-right: 20px;
margin-bottom: 40px;
height: 300px;
width: 127px;
background: url("../images/pot_flower.png") no-repeat right/100%;
}

.app-footer {
margin-top: 20px;
text-shadow: 1px 1px 0px #fff;
}

.app-footer,
.app-footer a {
color: #737373;
float: right;
margin-top: 40px;
margin-right: 20px;
margin-bottom: 40px;
height: 300px;
width: 127px;
background: url("../../default.theme/images/pot_flower.png") no-repeat right/100%;
}

.app-footer b {
color: #8a8a8a;
.app-header {
top: 0;
height: 60px;
padding-top: 27px;
padding-bottom: 80px;
}

.app-footer a {
border-bottom: 1px dotted #aaa;
}

.app-footer a:hover b {
color: #2a6496;
.app-header .form-group {
margin-top: 15px;
margin-bottom: 0;
line-height: 1;
}

a,
.app-version,
.app-github {
white-space: nowrap;
.app-header h1 {
margin: 0;
position: relative;
bottom: 2px;
float: right;
width: auto;
font-size: 55px;
line-height: 1;
}

.app-github {
padding-left: 26px;
padding-right: 26px;
padding-left: 26px;
padding-right: 26px;
}

@media (max-width: 991px) {
.app-header,
.app-footer {
padding-left: 20px;
padding-right: 20px;
}

.app-content {
padding: 20px 40px 60px;
}

.app-flower {
display: none;
}

.app-github {
padding-left: 0;
}

.app-github:before {
content: "";
display: block;
margin-top: 1em;
}
}

@media (min-width: 992px) {
h1 {
margin-top: 145px;
}
}

@media only screen and (-webkit-min-device-pixel-ratio: 2) {
.app-logo {
background: url("../images/laxarjs_logo@2x.png") no-repeat right/100%;
}

.app-flower {
background: url("../images/pot_flower@2x.png") no-repeat right/100%;
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 80306ab

Please sign in to comment.