Skip to content

A
apollo
Commit 5b2072cd by Jason Song Committed by GitHub
Options

Merge pull request #521 from lepdou/fix_0119

add col-sm-x style for small screen
parents 4f3dd644 d7f64f63
Showing with 33 additions and 24 deletions
apollo-portal/src/main/resources/static/styles/common-style.css
...@@ -423,9 +423,11 @@ table th { ...@@ -423,9 +423,11 @@ table th {
} }
.namespace-panel .namespace-view-table .search-input { .namespace-panel .namespace-view-table .search-input {
padding-top: 15px; padding: 15px 0 15px 10px;
padding-bottom: 10px; }
.namespace-panel .namespace-view-table .search-input input {
width: 350px;
} }
.namespace-panel .no-config-panel { .namespace-panel .no-config-panel {
...@@ -775,10 +777,12 @@ table th { ...@@ -775,10 +777,12 @@ table th {
} }
.search-onblur { .search-onblur {
width: 165px;
background: #f5f5f5; background: #f5f5f5;
} }
.search-focus { .search-focus {
width: 165px;
background: #fff; background: #fff;
} }
apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<header class="panel-heading"> <header class="panel-heading">
<div class="row"> <div class="row">
<div class="col-md-6 header-namespace"> <div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip"
data-placement="bottom" data-placement="bottom"
title="{{namespace.comment}}"></b> title="{{namespace.comment}}"></b>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</span> </span>
</div> </div>
<div class="col-md-6 text-right header-buttons"> <div class="col-md-6 col-sm-6 text-right header-buttons">
<a type="button" class="btn btn-success btn-sm" <a type="button" class="btn btn-success btn-sm"
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)"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<!--second header--> <!--second header-->
<header class="panel-heading second-panel-heading"> <header class="panel-heading second-panel-heading">
<div class="row"> <div class="row">
<div class="col-md-8 pull-left"> <div class="col-md-12 pull-left">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace.branch, 'table')" <li role="presentation" ng-click="switchView(namespace.branch, 'table')"
ng-show="namespace.isPropertiesFormat"> ng-show="namespace.isPropertiesFormat">
...@@ -386,13 +386,15 @@ ...@@ -386,13 +386,15 @@
</div> </div>
<!--history view--> <!--history view-->
<div class="J_historyview history-view" ng-show="namespace.branch.viewType == 'history'"> <div class="J_historyview history-view" ng-show="namespace.branch.viewType == 'history'">
<div class="media" ng-repeat="commits in namespace.branch.commits"> <div class="media"
ng-show="namespace.branch.commits && namespace.branch.commits.length"
ng-repeat="commits in namespace.branch.commits">
<div class="media-body"> <div class="media-body">
<div class="row"> <div class="row">
<div class="col-md-6"><h3 class="media-heading" <div class="col-md-6 col-sm-6 "><h3 class="media-heading"
ng-bind="commits.dataChangeCreatedBy"></h3> ng-bind="commits.dataChangeCreatedBy"></h3>
</div> </div>
<div class="col-md-6 text-right"> <div class="col-md-6 col-sm-6 text-right">
<h5 class="media-heading" <h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div> </div>
...@@ -516,6 +518,9 @@ ...@@ -516,6 +518,9 @@
ng-click="loadCommitHistory(namespace.branch)">加载更多 ng-click="loadCommitHistory(namespace.branch)">加载更多
<span class="glyphicon glyphicon-menu-down"></span></button> <span class="glyphicon glyphicon-menu-down"></span></button>
</div> </div>
<div class="empty-container text-center" ng-show="!namespace.branch.commits || !namespace.branch.commits.length">
无更改历史
</div>
</div> </div>
</section> </section>
</section> </section>
apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<!--main header--> <!--main header-->
<header class="panel-heading"> <header class="panel-heading">
<div class="row"> <div class="row">
<div class="col-md-6 header-namespace"> <div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName" <b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-info no-radius namespace-label" ng-bind="namespace.format"></span> <span class="label label-info no-radius namespace-label" ng-bind="namespace.format"></span>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
ng-show="namespace.lockOwner">当前修改者:{{namespace.lockOwner}}</span> ng-show="namespace.lockOwner">当前修改者:{{namespace.lockOwner}}</span>
</div> </div>
<div class="col-md-6 text-right header-buttons"> <div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-success btn-sm" <button type="button" class="btn btn-success btn-sm"
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)"
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<!--second header--> <!--second header-->
<header class="panel-heading second-panel-heading"> <header class="panel-heading second-panel-heading">
<div class="row"> <div class="row">
<div class="col-md-6 pull-left"> <div class="col-md-6 col-sm-6 pull-left">
<!--master branch nav tabs--> <!--master branch nav tabs-->
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace, 'table')" <li role="presentation" ng-click="switchView(namespace, 'table')"
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="col-md-6 text-right"> <div class="col-md-6 col-sm-6 text-right">
<a class="clipboard" <a class="clipboard"
data-clipboard-text="{{namespace.text}}" data-clipboard-text="{{namespace.text}}"
data-tooltip="tooltip" data-placement="bottom" title="复制文本" data-tooltip="tooltip" data-placement="bottom" title="复制文本"
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</div> </div>
<!--not link namespace--> <!--not link namespace-->
<div ng-if="!namespace.isLinkedNamespace"> <div ng-if="!namespace.isLinkedNamespace">
<div class="col-md-8 col-lg-offset-2 search-input" ng-show="namespace.showSearchInput"> <div class="search-input" ng-show="namespace.showSearchInput">
<input type="text" class="form-control" placeholder="输入key过滤" <input type="text" class="form-control" placeholder="输入key过滤"
ng-model="namespace.searchKey" ng-model="namespace.searchKey"
ng-change="searchItems(namespace)"> ng-change="searchItems(namespace)">
...@@ -268,11 +268,11 @@ ...@@ -268,11 +268,11 @@
<div class="panel panel-default" ng-if="namespace.isLinkedNamespace"> <div class="panel panel-default" ng-if="namespace.isLinkedNamespace">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
<div class="padding-top-5 col-md-4"> <div class="padding-top-5 col-md-4 col-sm-4">
覆盖的配置 覆盖的配置
</div> </div>
<div class="col-md-2 col-lg-offset-6 text-right"> <div class="col-md-8 col-sm-8">
<input type="text" class="form-control" placeholder="filter by key ..." <input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus, ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus,
'search-focus': namespace.searchStatus == 'ON'}" 'search-focus': namespace.searchStatus == 'ON'}"
ng-model="namespace.searchKey" ng-model="namespace.searchKey"
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
<div class="panel panel-default" ng-if="namespace.publicNamespace"> <div class="panel panel-default" ng-if="namespace.publicNamespace">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
<div class="padding-top-5 col-md-4"> <div class="padding-top-5 col-md-4 col-sm-4">
公共的配置 公共的配置
<a href="/config.html?#/appid={{namespace.publicNamespace.baseInfo.appId}}" target="_blank"> <a href="/config.html?#/appid={{namespace.publicNamespace.baseInfo.appId}}" target="_blank">
<small> <small>
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
</a> </a>
</div> </div>
<div class="col-md-4 text-center"> <div class="col-md-4 col-sm-4 text-center">
<div class="btn-group btn-group-sm" role="group" ng-show="namespace.publicNamespace.isModified"> <div class="btn-group btn-group-sm" role="group" ng-show="namespace.publicNamespace.isModified">
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE' ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE'
...@@ -409,8 +409,8 @@ ...@@ -409,8 +409,8 @@
</div> </div>
</div> </div>
<div class="col-md-2 col-lg-offset-2 text-right"> <div class="col-md-4 col-sm-4">
<input type="text" class="form-control" placeholder="filter by key ..." <input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF' ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF'
|| !namespace.publicNamespace.searchStatus, || !namespace.publicNamespace.searchStatus,
'search-focus': namespace.publicNamespace.searchStatus == 'ON'}" 'search-focus': namespace.publicNamespace.searchStatus == 'ON'}"
...@@ -610,9 +610,9 @@ ...@@ -610,9 +610,9 @@
ng-repeat="commits in namespace.commits"> ng-repeat="commits in namespace.commits">
<div class="media-body"> <div class="media-body">
<div class="row"> <div class="row">
<div class="col-md-6"><h3 class="media-heading" ng-bind="commits.dataChangeCreatedBy"></h3> <div class="col-md-6 col-sm-6"><h3 class="media-heading" ng-bind="commits.dataChangeCreatedBy"></h3>
</div> </div>
<div class="col-md-6 text-right"><h5 class="media-heading" <div class="col-md-6 col-sm-6 text-right"><h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div> </div>
</div> </div>
...@@ -744,10 +744,10 @@ ...@@ -744,10 +744,10 @@
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-5 col-sm-5">
<small>实例说明:只展示最近一天访问过Apollo的实例</small> <small>实例说明:只展示最近一天访问过Apollo的实例</small>
</div> </div>
<div class="col-md-7 text-right"> <div class="col-md-7 col-sm-7 text-right">
<div class="btn-group btn-group-sm" role="group"> <div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}" ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}"
......
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