Skip to content

Commit 8f0fdc5

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
增加iclient9D站点logo、版本号；调整站点样式与自适应。review by zhurch
1 parent b448420 commit 8f0fdc5

File tree

23 files changed

+458
-151
lines changed

23 files changed

+458
-151
lines changed

‎build/build.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<html>
33
<head>
44
<title>自定义打包</title>
5+
<link rel="shortcut icon" type="image/x-icon" href="../web/favicon.ico"/>
56
<meta charset="UTF-8">
67
<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
78
<style type="text/css">

‎examples/3dwebgl/editor.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<html>
33
<meta charset="UTF-8">
44
<head>
5-
<title>SuperMap iClient3D示例代码</title>
5+
<title>SuperMap 3D-WebGL示例代码</title>
6+
<link rel="shortcut icon" type="image/x-icon" href="../../web/favicon.ico"/>
67
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
78
<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
89
<link href="http://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">

‎examples/3dwebgl/examples.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>SuperMap iClient3D示范程序</title>
6+
<title>SuperMap 3D-WebGL示范程序</title>
7+
<link rel="shortcut icon" type="image/x-icon" href="../../web/favicon.ico"/>
78
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
89
<link href="http://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
910
<link href="http://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">

‎examples/css/editor.css‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ html, body, .wrapper {
1414
.edit-container {
1515
background-color: #f9f9f9;
1616
position: relative;
17-
margin-top: 50px;
17+
margin-top: 52px;
1818
}
1919

2020
.edit-container section.content {
@@ -33,7 +33,6 @@ html, body, .wrapper {
3333
#codePane {
3434
height: 100%;
3535
box-shadow: 2px 0px 6px #cccccc;
36-
border-left: 1px solid #e7e7e7;
3736
}
3837

3938
.codePaneTool {
@@ -60,7 +59,6 @@ html, body, .wrapper {
6059

6160
#previewPane {
6261
height: 100%;
63-
border-left: 1px solid #e7e7e7;
6462
}
6563

6664
#innerPage {

‎examples/css/examples.css‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,41 @@
44
}
55

66
.examples-container {
7-
background-color: #ffffff;
7+
background-color: #f9f9f9;
88
margin-top: 50px;
99
overflow: auto;
1010
}
1111

12-
1312
#charts-list {
1413
margin: 0;
1514
padding: 0 20px;
1615
list-style: none;
1716
overflow: inherit;
18-
border-left: 1px solid #e7e7e7;
17+
background-color: #f9f9f9;
1918
}
2019

2120
h3.category-title {
2221
margin-top: 10px;
2322
height: 40px;
2423
line-height: 40px;
2524
margin-bottom: 0;
25+
margin-left: 2px;
26+
color:#555555
2627
}
2728

2829
@media (min-width: 1400px) {
2930
.col-xlg-2 {
3031
width: 16.66666667%;
32+
padding-bottom: 5px;
3133
}
3234
}
3335

3436
#charts-list .chart {
3537
width: 100%;
3638
max-width: 260px;
3739
margin: 0 auto;
38-
margin-bottom: 30px;
3940
-webkit-border-radius: 4px;
40-
border-radius: 4px;
41+
border-radius: 0;
4142
background: #fff;
4243
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
4344
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
@@ -53,39 +54,44 @@ h3.category-title {
5354
overflow: hidden;
5455
text-overflow: ellipsis;
5556
white-space: nowrap;
56-
padding: 10px 10px 8px 0;
57+
padding: 10px 10px 2px 0;
5758
margin: 0;
5859
font-weight: normal;
5960
}
6061

6162
#charts-list .chart .chart-link .chart-area {
6263
width: 100%;
64+
padding-top: 8px;
65+
padding-bottom: 8px;
6366
}
6467

6568
.box {
66-
border-top: 3px solid #3c8dbc;
69+
box-shadow: 0 0 0 rgba(0,0,0,0.1);
6770
}
6871

6972
.box.box-default {
70-
background-color: #FFFFFF;
71-
border-top-color: #3c8dbc;
73+
border:0;
74+
margin-bottom: 20px;
75+
border-top: 1px solid #3c8dbc;
7276
}
7377

7478
.box-title {
7579
padding-top: 10px;
7680
padding-bottom: 0;
77-
padding-left: 5px;
78-
color: #555555;
81+
color: #111111;
82+
font-family: 'Microsoft Yahei';
7983
}
8084

8185
.box-header {
8286
padding-top: 10px;
8387
padding-bottom: 5px;
8488
padding-left: 0;
89+
background-color: #f9f9f9;
8590
}
8691

8792
.box-body {
88-
padding: 0;
93+
background-color: #f9f9f9;
94+
padding-top: 5px;
8995
}
9096

9197
.main-footer {
@@ -94,4 +100,3 @@ h3.category-title {
94100
text-align: center;
95101
bottom: 0;
96102
}
97-

‎examples/css/header.css‎

Lines changed: 135 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,25 @@
22
font-size: 16px;
33
}
44

5+
.main-header .navbar-brand {
6+
padding-top: 10px;
7+
}
8+
59
.navbar .project-title {
610
text-decoration: none;
711
vertical-align: middle;
8-
font-family: HiraginoSansGB-W6;
12+
font-family: 'HiraginoSansGB-W6';
913
font-size: 24px;
1014
color: #FFFFFF;
1115
letter-spacing: -0.16px;
1216
}
1317

18+
/*头部选项下拉菜单框的样式*/
1419
.navbar-nav > li > .dropdown-menu {
15-
margin-top: 2px !important;
20+
margin-top: 0 !important;
21+
background-color: #3375A1;
22+
border: 0;
23+
border-radius: 0;
1624
}
1725

1826
.navbar #headerMenu {
@@ -73,38 +81,13 @@
7381
}
7482

7583
.main-header .sidebar-toggle:before {
76-
content: "\f03b";
77-
}
78-
79-
@media screen and (max-width: 767px) {
80-
#title {
81-
font-size: 18px;
82-
}
83-
}
84-
85-
@media screen and (max-width: 767px) {
86-
.navbar-nav > li > .dropdown-menu {
87-
margin-top: 0 !important;
88-
}
89-
90-
.navbar-brand {
91-
padding: 15px 0;
92-
}
93-
}
94-
95-
@media screen and (max-width: 430px) {
96-
#title {
97-
font-size: 12px;
98-
}
99-
100-
.sidebar-toggle {
101-
padding: 15px 15px !important;
102-
}
84+
/* content: "\f03b";*/
85+
content: "\f015";
10386
}
10487

10588
.navbar-brand {
10689
float: left;
107-
height: 50px;
90+
height: 52px;
10891
padding: 15px 15px;
10992
font-size: 18px;
11093
line-height: 20px;
@@ -115,12 +98,38 @@
11598
font-family: 'HiraginoSansGB-W6';
11699
font-size: 16px;
117100
color: #FFFFFF;
101+
height: 52px;
102+
padding-left: 10px;
103+
padding-top: 16px;
104+
padding-bottom: 15px;
105+
float: left;
118106
}
119107

120-
@media screen and (max-width: 430px){
121-
#suffix-title {
122-
font-size: 12px;
123-
}
108+
/*下拉菜单的样式*/
109+
.navbar-nav > .nav-dropdown-menu > .dropdown-menu > li > a {
110+
color: #F8F8F8;
111+
font-size: 14px;
112+
padding-top: 12px;
113+
padding-bottom: 12px;
114+
}
115+
116+
/*鼠标在下拉菜单划过时的样式*/
117+
.navbar-nav > .nav-dropdown-menu > .dropdown-menu > li:hover > a {
118+
background-color: rgba(0, 0, 0, 0.1);
119+
/* background-color: #3c8dbc;*/
120+
}
121+
122+
.navbar-nav > li > a {
123+
padding-bottom: 17px;
124+
}
125+
126+
/*头部选项选中时的颜色*/
127+
.skin-blue .main-header .navbar .nav > li > a:hover, .skin-blue .main-header .navbar .nav > li > a:active, .skin-blue .main-header .navbar .nav > li > a:focus, .skin-blue .main-header .navbar .nav .open > a, .skin-blue .main-header .navbar .nav .open > a:hover, .skin-blue .main-header .navbar .nav .open > a:focus, .skin-blue .main-header .navbar .nav > .active > a {
128+
background: #3375A1;
129+
}
130+
131+
.skin-blue .main-header .navbar .nav > li > a:hover {
132+
background: rgba(0, 0, 0, 0.1);
124133
}
125134

126135
@media screen and (max-width: 992px) {
@@ -149,5 +158,97 @@
149158
.collapse.in {
150159
display: block !important;
151160
}
161+
162+
/*尺寸小于992时下拉菜单的样式*/
163+
.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
164+
border: 0;
165+
border-top: 1px solid #f9f9f9;
166+
background: #3375A1;
167+
}
168+
169+
.navbar-custom-menu > .navbar-nav > li > .dropdown-menu > li {
170+
position: relative;
171+
right: 0;
172+
left: auto;
173+
border: 0;
174+
background: #3375A1;
175+
}
176+
177+
.skin-blue .main-header .navbar .dropdown-menu > li > a {
178+
color: #ffffff;
179+
}
152180
}
153181

182+
@media screen and (max-width: 768px) {
183+
#title {
184+
font-size: 18px;
185+
}
186+
187+
#suffix-title {
188+
font-size: 14px;
189+
}
190+
191+
.navbar-nav > li > .dropdown-menu {
192+
margin-top: 0 !important;
193+
}
194+
195+
.navbar-brand {
196+
padding: 15px 0;
197+
}
198+
}
199+
200+
/*尺寸小于510时,利用按钮展开的头部选项的样式*/
201+
@media (max-width: 510px) {
202+
.navbar-custom-menu .navbar-nav > li > a {
203+
padding-left: 15px;
204+
padding-right: 15px;
205+
padding-top: 15px;
206+
padding-bottom: 15px;
207+
line-height: 20px;
208+
}
209+
210+
.skin-blue .main-header .navbar .nav > li > a {
211+
font-size: 15px;
212+
}
213+
}
214+
215+
@media screen and (max-width: 460px) {
216+
#title {
217+
font-size: 15px;
218+
}
219+
220+
#suffix-title {
221+
padding-left: 5px;
222+
font-size: 12px;
223+
padding-top: 17px;
224+
padding-bottom: 15px;
225+
}
226+
227+
.sidebar-toggle {
228+
padding: 15px 15px !important;
229+
}
230+
}
231+
232+
/*尺寸小于410时*/
233+
@media (max-width: 410px) {
234+
.navbar-custom-menu .navbar-nav > li > a {
235+
padding-left: 10px;
236+
padding-right: 10px;
237+
}
238+
239+
.skin-blue .main-header .navbar .nav > li > a {
240+
font-size: 13px;
241+
}
242+
243+
#title {
244+
font-size: 8px;
245+
}
246+
247+
#suffix-title {
248+
font-size: 8px;
249+
}
250+
251+
.navbar-toggle {
252+
padding: 15px 5px 15px 5px;
253+
}
254+
}

0 commit comments

Comments
 (0)