From: Jeremy Mordkoff Date: Sat, 2 Apr 2016 18:11:09 +0000 (-0400) Subject: Fix the icon layout X-Git-Tag: v0.0~14 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=83801779ffb0581795d01247d50741e89138558a;p=osm%2Friftware.git Fix the icon layout Signed-off-by: Jeremy Mordkoff --- diff --git a/modules/ui/composer/webapp/src/images/osm_header_253x50.png b/modules/ui/composer/webapp/src/images/osm_header_253x50.png index 3055122..1005431 100644 Binary files a/modules/ui/composer/webapp/src/images/osm_header_253x50.png and b/modules/ui/composer/webapp/src/images/osm_header_253x50.png differ diff --git a/modules/ui/composer/webapp/src/images/osm_header_506x100.png b/modules/ui/composer/webapp/src/images/osm_header_506x100.png index 4b7a344..7ece845 100644 Binary files a/modules/ui/composer/webapp/src/images/osm_header_506x100.png and b/modules/ui/composer/webapp/src/images/osm_header_506x100.png differ diff --git a/modules/ui/composer/webapp/src/styles/RiftHeader.scss b/modules/ui/composer/webapp/src/styles/RiftHeader.scss index 048749d..414775a 100644 --- a/modules/ui/composer/webapp/src/styles/RiftHeader.scss +++ b/modules/ui/composer/webapp/src/styles/RiftHeader.scss @@ -12,11 +12,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - - -/* - * * */ @import 'variables'; @@ -35,7 +30,7 @@ background-size: contain; line-height: 51px; margin-left: 30px; - padding-left: 280px; + padding-left: 160px; position: absolute; left: 0; text-transform: uppercase; diff --git a/modules/ui/rw.ui/webapp/app/assets/img/osm_header.png b/modules/ui/rw.ui/webapp/app/assets/img/osm_header.png index c67dca3..53a9500 100644 Binary files a/modules/ui/rw.ui/webapp/app/assets/img/osm_header.png and b/modules/ui/rw.ui/webapp/app/assets/img/osm_header.png differ diff --git a/modules/ui/rw.ui/webapp/app/assets/img/osm_header_253x50.png b/modules/ui/rw.ui/webapp/app/assets/img/osm_header_253x50.png index 3055122..1005431 100644 Binary files a/modules/ui/rw.ui/webapp/app/assets/img/osm_header_253x50.png and b/modules/ui/rw.ui/webapp/app/assets/img/osm_header_253x50.png differ diff --git a/modules/ui/rw.ui/webapp/app/assets/img/osm_header_506x100.png b/modules/ui/rw.ui/webapp/app/assets/img/osm_header_506x100.png index 4b7a344..7ece845 100644 Binary files a/modules/ui/rw.ui/webapp/app/assets/img/osm_header_506x100.png and b/modules/ui/rw.ui/webapp/app/assets/img/osm_header_506x100.png differ diff --git a/modules/ui/rw.ui/webapp/app/modules/components/header/header.scss b/modules/ui/rw.ui/webapp/app/modules/components/header/header.scss index 0ae01b8..9290f5e 100644 --- a/modules/ui/rw.ui/webapp/app/modules/components/header/header.scss +++ b/modules/ui/rw.ui/webapp/app/modules/components/header/header.scss @@ -12,8 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ - /* * * @@ -35,7 +35,7 @@ header.header-app-component { height: 51px; line-height: 51px; margin-left: 20px; - padding-left: 280px; + padding-left: 160px; left: 0; text-transform: uppercase; font-size: 1.625rem; diff --git a/modules/ui/rw.ui/webapp/app/modules/login/login.scss b/modules/ui/rw.ui/webapp/app/modules/login/login.scss index 14aa8b0..f386776 100644 --- a/modules/ui/rw.ui/webapp/app/modules/login/login.scss +++ b/modules/ui/rw.ui/webapp/app/modules/login/login.scss @@ -12,8 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * */ - /* * * @@ -22,7 +22,7 @@ background-image: url(../../assets/img/osm_header_506x100.png); background-size:contain; background-repeat:no-repeat; - width:400px; + width: 280px; height: 102px; margin-left: auto; margin-right: auto;