Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
saasio
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
reyun
saasio
Commits
a5cb65f3
Commit
a5cb65f3
authored
7 years ago
by
yangfangfang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'master' of git.minrow.com:reyun/saasio
parent
52e94619
master
…
20180326_events4track
30921_bugfix
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
29 deletions
+7
-29
index.html
src/main/websrc/index.html
+1
-21
style.scss
src/main/websrc/styles/style.scss
+3
-5
notice.html
src/main/websrc/template/common/notice.html
+3
-3
No files found.
src/main/websrc/index.html
View file @
a5cb65f3
...
...
@@ -145,11 +145,7 @@
<div
class=
"wapSetInfo p"
ng-show=
"mainMenu!='management' && pagePath!='userinfo'"
>
<select-list
meau-info=
"applistInfo"
meau-id=
"appid"
meau-data=
"appidInit"
meau-refresh=
"appfresh"
class=
"appWrap"
icon-type=
"white"
style=
"margin:0px;"
></select-list>
</div>
<div
ng-if=
"!preStatus"
class=
"nociceInfo"
ng-click=
"showNoticeWin()"
ng-show=
"noticeList.length>0"
ng-cloak
>
<span
class=
"noticeNews"
ng-class=
"{'noticeIcon':newNoticeInfo.isRead,'noticeNews':!newNoticeInfo.isRead}"
></span>
{{newNoticeInfo.title}}
</div>
</div>
</div>
<div
class=
"contentWrap"
>
...
...
@@ -177,22 +173,6 @@
</div>
</div>
<div
class=
"dialogDescWin noticeWin"
ng-class=
"{'myNotice':showNoticew}"
>
<div
class=
"dlgTitle"
>
TrackingIO系统公告
<div
class=
"right closeGray"
ng-click=
"hideNoticeWin()"
></div>
</div>
<div
class=
"dlgCnt"
>
<div
class=
"noticeItem"
ng-repeat=
"news in noticeList track by $index"
>
<div
class=
"noticeTitle"
ng-click=
"clickNotice(news)"
>
<h6><span
ng-class=
"{'redSpan':!news.isTop && !news.isRead,'noticeTopIcon':news.isTop}"
></span>
{{news.title}}
</h6>
<em>
{{news.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}
</em>
</div>
<div
class=
"noticeContent"
ng-bind-html=
"news.content | filterHtml"
ng-if=
"curNoticeId==news.id"
></div>
</div>
</div>
</div>
<div
class=
"openTipWin"
ng-if=
"tipCustom"
ng-controller=
"collectCtrl"
ng-cloak
>
<div
class=
"closeGray"
ng-click=
"closeTip()"
></div>
<div
class=
"tipCont"
>
...
...
This diff is collapsed.
Click to expand it.
src/main/websrc/styles/style.scss
View file @
a5cb65f3
...
...
@@ -3647,9 +3647,7 @@ pre{
margin-bottom
:
20px
;
padding-bottom
:
10px
;
}
.dialogDescWin.noticeWin.myNotice
,
.dialogDescWin.addWin.myNotice
{
display
:block
;
}
.noticeWin
.dlgTitle
{
height
:
52px
;
text-align
:left
;
...
...
@@ -6911,10 +6909,10 @@ pre{
.noticeDetail
{
padding-top
:
22px
;
h5
{
.
h5
{
font-size
:
16px
;
}
p
{
.
p
{
color
:
#999999
;
}
.noticeNews
{
...
...
This diff is collapsed.
Click to expand it.
src/main/websrc/template/common/notice.html
View file @
a5cb65f3
...
...
@@ -22,11 +22,11 @@
</div>
<div
class=
"winCont"
>
<div
class=
"noticeDetail"
>
<
h5>
{{curNoticeInfo.title}}
</h5
>
<
p>
{{curNoticeInfo.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}
</p
>
<
div
class=
"h5"
>
{{curNoticeInfo.title}}
</div
>
<
div
class=
"p"
>
{{curNoticeInfo.deployDate | date:'yyyy-MM-dd HH:mm:ss'}}
</div
>
<div
class=
"noticeNews"
ng-bind-html=
"curNoticeInfo.content | filterHtml"
></div>
<div
class=
"noticeLogo"
></div>
</div>
<div
class=
"noticeLogo"
></div>
</div>
<div
class=
"hideNotice"
ng-click=
"changeLook()"
></div>
</div>
...
...
This diff is collapsed.
Click to expand it.
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