From 6582efe6644d2cddb69622b2c279c1d9c40c7551 Mon Sep 17 00:00:00 2001 From: BuiDang Date: Wed, 30 Nov 2016 20:58:49 +0700 Subject: [PATCH] add css --- app/scripts/controllers/main.js | 1 + app/styles/main.css | 24 +++++++++++++++++++++++- app/views/main.html | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index d5a7593..fecb33e 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -2,6 +2,7 @@ define(['app'], function (app) { 'use strict'; app.controller('MainCtrl', function ($rootScope, $scope, $timeout, $illustration, $t_shirt, $routeParams) { //Define and init var + $('[data-toggle="tooltip"]').tooltip() $rootScope.API_URL = 'http://domain.com'; $scope.designFrameView = 'views/tshirt-design.html?ver='+VERSION; $scope.designPartIllustration = 'views/design_part/illustration.html?ver='+VERSION; diff --git a/app/styles/main.css b/app/styles/main.css index f4ae944..a493cc2 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -12,6 +12,9 @@ body { height:100%; width:100%; } +a:hover{ + text-transform: none; +} /*Scroll bar style*/ ::-webkit-scrollbar { -webkit-appearance: none; @@ -122,6 +125,10 @@ header .top-menu li a{ border-right: 1px solid #000000; font-size: 12px; } +header .top-menu li a:hover{ + color: #cccccc; + text-decoration: none; +} header .top-menu li:last-child a{ border-right: 0; } @@ -134,20 +141,31 @@ header .top-control li{ float: left; margin: 0 10px; } +header .top-control li div{ + cursor: pointer; +} header .top-control li .bt-yellow{ background-color: #fe6a00; color: #ffffff; padding: 3px 10px; font-size: 12px; } +header .top-control li .bt-yellow:hover{ + background-color: #fe913e; +} + header .user-control{ background-color: #888888; text-align: center; + cursor: pointer; } header .user-control div{ font-size: 12px; color: #ffffff; } +header .user-control div:first-child:hover{ + background-color: #b2b1b1; +} header .user-control div:first-child{ padding: 10px 10px; } @@ -155,6 +173,9 @@ header .user-control div:last-child{ background-color: #fe6a00; padding: 3px 10px; } +header .user-control div:last-child:hover{ + background-color: #fe913e; +} /*NAVIGATION*/ nav{ border-bottom: 1px solid #dcdcdc; @@ -379,7 +400,7 @@ aside .step .step-box .tshirt-saveorder .action:last-child{ padding-left: 5px; } aside .step .step-box .tshirt-saveorder .action button{ - padding: 4px 10px; + padding: 4px 35px; width: 100%; } @@ -956,6 +977,7 @@ footer .logo-bottom img{ header .top-control li{ margin: 0 4px; } + header .top-menu{ display: table; margin: auto; diff --git a/app/views/main.html b/app/views/main.html index d1b8448..e0cadb8 100644 --- a/app/views/main.html +++ b/app/views/main.html @@ -60,9 +60,9 @@

加工箇所を選択してデザインしてください。

-- 1.8.5.3