Commit 5ddb83f1 by Motohisa Nakano

Merge branch 'sbb' of gitlab.agentec.jp:abook_web/web-viewer into sbb

parents c58a7bb3 1f629cc2
......@@ -5,3 +5,4 @@ _config/
ob/
*.gz
*.zip
patch/
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20121221-3):",
"txtLoginUser":"(Ver.20130514_01):",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20121221-3)_indonesia:",
"txtLoginUser":"(Ver.20130514_01):",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"Tipis",
......
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20121221-3):",
"txtLoginUser":"(Ver.20130514_01):",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20121221-3):",
"txtLoginUser":"(Ver.20130514_01):",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20121221-3)ログイン中:",
"txtLoginUser":"(Ver.20130514_01):",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......
......@@ -107,8 +107,8 @@
.tops ul{
float:right;
margin:15px 0 5px 0;
padding:9px 0 9px 12px;
width:353px;
padding:9px 0 9px 5px;
width:360px;
height:18px;
background:url(../images/order_box_bg.png) no-repeat;
}
......@@ -138,7 +138,9 @@
text-decoration:underline;
}
.tops ul li span.sortHead {
padding-right:20px;
text-align:center;
width:70px;
margin-right:7px;
}
.tops p{ font-size:14px; padding:22px 2px 0 10px; margin:0; color:#f0f0f0;}
......@@ -187,7 +189,7 @@ font-size:13px;
.cnt_section .text ul.pic{
float:left;
margin-left:300px;
margin-left:280px;
}
.cnt_section .text ul.pic li{
height:82px;
......
......@@ -69,8 +69,8 @@
.tops ul{
float:right;
margin:0px;
padding:9px 0 9px 12px;
width:408px;
padding:9px 0 9px 5px;
width:415px;
height:18px;
background:url(../images/order_box_bg2.png) no-repeat;
}
......@@ -100,7 +100,9 @@
text-decoration:underline;
}
.tops ul li span.sortHead {
padding-right:20px;
text-align:center;
width:70px;
margin-right:7px;
}
.tops p{ font-size:14px; padding:10px 2px 0 10px; margin:0; color:#f0f0f0;}
......@@ -127,7 +129,7 @@ section{
float:left;
background:#fff;
}
.cnt_section a.img canvas{ margin:0 auto; height: 105px; width: 150px;}
.cnt_section a.img canvas{ margin:0 auto; height: 105px; width: 160px;}
.cnt_section .text{
float:left;
height:120px;
......@@ -150,7 +152,7 @@ font-size:13px;
.cnt_section .text ul.pic{
float:left;
margin-left:300px;
margin-left:280px;
}
.cnt_section .text ul.pic li{
height:82px;
......
......@@ -21,8 +21,8 @@
.tops ul{
float:right;
margin:0;
padding:9px 0 9px 12px;
width:353px;
padding:9px 0 9px 5px;
width:360px;
height:18px;
background:url(../images/order_box_bg.png) no-repeat;
}
......@@ -56,7 +56,9 @@
.tops p{ font-size:12px; position:absolute; right:0; top:40px; padding:0 2px 0 0; margin:0; color:#f0f0f0;}
.no_m_right{ margin-left:0!important;}
.tops ul li span.sortHead {
padding-right:20px;
text-align:center;
width:70px;
margin-right:7px;
}
.tops a.shelvesButton {
......
......@@ -159,8 +159,8 @@ a.delete:hover:not(:target) {
.tops ul{
float:right;
margin:0px;
padding:9px 0 9px 12px;
width:353px;
padding:9px 0 9px 5px;
width:360px;
height:18px;
background:url(../images/order_box_bg.png) no-repeat;
}
......@@ -190,7 +190,9 @@ a.delete:hover:not(:target) {
text-decoration:underline;
}
.tops ul li span.sortHead {
padding-right:20px;
text-align:center;
width:70px;
margin-right:7px;
}
.tops p{ color:#333333; font-size:12px; position:absolute; right:0; top:25px; padding:0 2px 0 0; margin:0; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment