Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
92a90e90
Commit
92a90e90
authored
Aug 16, 2016
by
张乐
Committed by
GitHub
Aug 16, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #383 from nobodyiam/portal-responsive
style change for responsiveness
parents
b804bcc5
9a6c7ae6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
18 deletions
+36
-18
config.html
apollo-portal/src/main/resources/static/config.html
+7
-10
common-style.css
...-portal/src/main/resources/static/styles/common-style.css
+25
-0
entrance.html
...l/src/main/resources/static/views/component/entrance.html
+2
-6
namespace-panel.html
...ain/resources/static/views/component/namespace-panel.html
+2
-2
No files found.
apollo-portal/src/main/resources/static/config.html
View file @
92a90e90
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<div
class=
"row config-info-container"
>
<div
class=
"row config-info-container"
>
<!--tag导航-->
<!--tag导航-->
<div
class=
"col-md-3"
ng-controller=
"ConfigBaseInfoController"
>
<div
class=
"col-md-3
col-xs-3 col-sm-3
"
ng-controller=
"ConfigBaseInfoController"
>
<div
id=
"treeview"
></div>
<div
id=
"treeview"
></div>
<!--app info-->
<!--app info-->
<section
class=
"panel"
>
<section
class=
"panel"
>
...
@@ -66,22 +66,19 @@
...
@@ -66,22 +66,19 @@
</div>
</div>
</section>
</section>
<a
class=
"list-group-item"
ng-show=
"missEnvs.length > 0"
ng-click=
"createAppInMissEnv()"
>
<a
class=
"list-group-item"
ng-show=
"missEnvs.length > 0"
ng-click=
"createAppInMissEnv()"
>
<div
class=
"row"
>
<div
class=
"row icon-text icon-plus-orange"
>
<div
class=
"col-md-2"
><img
src=
"img/plus-orange.png"
class=
"i-20"
></div>
<p
class=
"btn-title ng-binding"
>
补缺环境
</p>
<div
class=
"col-md-10 hidden-xs"
>
<p
class=
"btn-title"
>
补缺环境
</p>
</div>
</div>
</div>
</a>
</a>
<apolloentrance
apollo-title=
"'添加集群'"
apollo-img-src=
"'
img/plus-orange.png
'"
<apolloentrance
apollo-title=
"'添加集群'"
apollo-img-src=
"'
plus-orange
'"
apollo-href=
"'cluster.html?#/appid=' + pageContext.appId"
></apolloentrance>
apollo-href=
"'cluster.html?#/appid=' + pageContext.appId"
></apolloentrance>
<apolloentrance
apollo-title=
"'添加Namespace'"
apollo-img-src=
"'
img/plus-orange.png
'"
<apolloentrance
apollo-title=
"'添加Namespace'"
apollo-img-src=
"'
plus-orange
'"
apollo-href=
"'namespace.html?#/appid=' + pageContext.appId"
apollo-href=
"'namespace.html?#/appid=' + pageContext.appId"
ng-show=
"hasCreateNamespacePermission"
></apolloentrance>
ng-show=
"hasCreateNamespacePermission"
></apolloentrance>
<apolloentrance
apollo-title=
"'项目权限'"
apollo-img-src=
"'
img/user_manage.png
'"
<apolloentrance
apollo-title=
"'项目权限'"
apollo-img-src=
"'
user-manage
'"
apollo-href=
"'/app/role.html?#/appid=' + pageContext.appId"
apollo-href=
"'/app/role.html?#/appid=' + pageContext.appId"
ng-show=
"hasAssignUserPermission"
></apolloentrance>
ng-show=
"hasAssignUserPermission"
></apolloentrance>
</section>
</section>
...
@@ -90,7 +87,7 @@
...
@@ -90,7 +87,7 @@
</div>
</div>
<!--namespaces-->
<!--namespaces-->
<div
class=
"col-md-9 config-item-container hide"
ng-controller=
"ConfigNamespaceController"
>
<div
class=
"col-md-9 co
l-xs-9 col-sm-9 co
nfig-item-container hide"
ng-controller=
"ConfigNamespaceController"
>
<div
ng-repeat=
"namespace in namespaces"
>
<div
ng-repeat=
"namespace in namespaces"
>
<apollonspanel
namespace=
"namespace"
app-id=
"pageContext.appId"
<apollonspanel
namespace=
"namespace"
app-id=
"pageContext.appId"
env=
"pageContext.env"
cluster=
"pageContext.clusterName"
env=
"pageContext.env"
cluster=
"pageContext.clusterName"
...
...
apollo-portal/src/main/resources/static/styles/common-style.css
View file @
92a90e90
...
@@ -166,6 +166,15 @@ table th {
...
@@ -166,6 +166,15 @@ table th {
font-weight
:
300
;
font-weight
:
300
;
}
}
.panel-heading
.header-namespace
{
min-width
:
415px
;
}
.panel-heading
.header-buttons
{
float
:
right
;
min-width
:
405px
;
}
.project-info
th
{
.project-info
th
{
text-align
:
right
;
text-align
:
right
;
padding
:
4px
6px
;
padding
:
4px
6px
;
...
@@ -339,8 +348,24 @@ table th {
...
@@ -339,8 +348,24 @@ table th {
color
:
gray
;
color
:
gray
;
font-family
:
"Apple Color Emoji"
;
font-family
:
"Apple Color Emoji"
;
font-size
:
16px
;
font-size
:
16px
;
margin
:
0
;
}
.list-group-item
.icon-plus-orange
{
background
:
url(../img/plus-orange.png)
no-repeat
;
}
}
.list-group-item
.icon-user-manage
{
background
:
url(../img/user_manage.png)
no-repeat
;
}
.list-group-item
.icon-text
{
background-size
:
20px
;
background-position
:
5%
50%
;
padding
:
5px
0
5px
50px
;
}
/*搜索框*/
/*搜索框*/
::-webkit-scrollbar
{
::-webkit-scrollbar
{
width
:
0
;
width
:
0
;
...
...
apollo-portal/src/main/resources/static/views/component/entrance.html
View file @
92a90e90
<a
class=
"list-group-item"
href=
"{{href}}"
>
<a
class=
"list-group-item"
href=
"{{href}}"
>
<div
class=
"row"
>
<div
class=
"row icon-text icon-{{imgSrc}}"
>
<div
class=
"col-md-2"
><img
src=
"{{imgSrc}}"
class=
"i-20"
></div>
<p
class=
"btn-title"
>
{{title}}
</p>
<div
class=
"col-md-10 hidden-xs"
>
<p
class=
"btn-title"
>
{{title}}
</p>
</div>
</div>
</div>
</a>
</a>
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
View file @
92a90e90
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<header
class=
"panel-heading"
>
<header
class=
"panel-heading"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<div
class=
"col-md-6
header-namespace
"
>
<b
ng-bind=
"namespace.viewName"
style=
"font-size: 20px;"
data-tooltip=
"tooltip"
data-placement=
"bottom"
<b
ng-bind=
"namespace.viewName"
style=
"font-size: 20px;"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"{{namespace.comment}}"
></b>
title=
"{{namespace.comment}}"
></b>
<span
class=
"label label-info no-radius"
ng-bind=
"namespace.format"
></span>
<span
class=
"label label-info no-radius"
ng-bind=
"namespace.format"
></span>
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<span
class=
"label label-warning no-radius"
<span
class=
"label label-warning no-radius"
ng-show=
"namespace.lockOwner"
>
当前修改者:{{namespace.lockOwner}}
</span>
ng-show=
"namespace.lockOwner"
>
当前修改者:{{namespace.lockOwner}}
</span>
</div>
</div>
<div
class=
"col-md-6 text-right"
>
<div
class=
"col-md-6 text-right
header-buttons
"
>
<button
type=
"button"
class=
"btn btn-success btn-sm J_tableview_btn"
<button
type=
"button"
class=
"btn btn-success btn-sm J_tableview_btn"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"发布配置"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"发布配置"
ng-show=
"namespace.hasReleasePermission || namespace.hasModifyPermission"
ng-show=
"namespace.hasReleasePermission || namespace.hasModifyPermission"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment