Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
mycard
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
syntax_j
mycard
Commits
65b3f181
Commit
65b3f181
authored
Oct 25, 2016
by
wudizhanche1000
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/v3' into v3
parents
73358670
76ae18c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
23 deletions
+25
-23
app/mycard.component.css
app/mycard.component.css
+0
-12
app/mycard.component.html
app/mycard.component.html
+4
-4
styles.css
styles.css
+21
-7
No files found.
app/mycard.component.css
View file @
65b3f181
...
@@ -82,15 +82,3 @@ li > a:hover, #window-buttons > i:hover {
...
@@ -82,15 +82,3 @@ li > a:hover, #window-buttons > i:hover {
.navbar
{
.navbar
{
border-radius
:
initial
;
border-radius
:
initial
;
}
}
/* https://github.com/electron/electron/issues/7661#event-827104990 */
webview
.hide
{
width
:
0
;
height
:
0
;
flex
:
0
1
;
display
:
inherit
;
}
.hide
{
display
:
none
;
}
\ No newline at end of file
app/mycard.component.html
View file @
65b3f181
...
@@ -31,8 +31,8 @@
...
@@ -31,8 +31,8 @@
</div>
</div>
</nav>
</nav>
<login
class=
"page"
[
ngClass]=
"{hide: currentPage!= 'login'}
"
></login>
<login
class=
"page"
[
hidden]=
"currentPage!= 'login'
"
></login>
<store
class=
"page"
[
ngClass]=
"{hide: currentPage!= 'store'}
"
></store>
<store
class=
"page"
[
hidden]=
"currentPage!= 'store'
"
></store>
<lobby
class=
"page"
[
ngClass]=
"{hide: currentPage!= 'lobby'}
"
></lobby>
<lobby
class=
"page"
[
hidden]=
"currentPage!= 'lobby'
"
></lobby>
<webview
id=
"community"
class=
"page"
[
ngClass]=
"{hide: currentPage!= 'community'}
"
<webview
id=
"community"
class=
"page"
[
hidden]=
" currentPage!= 'community'
"
src=
"https://ygobbs.com"
></webview>
src=
"https://ygobbs.com"
></webview>
\ No newline at end of file
styles.css
View file @
65b3f181
/* Master Styles */
/* Master Styles */
h1
{
h1
{
color
:
#369
;
color
:
#369
;
font-family
:
Arial
,
Helvetica
,
sans-serif
;
font-family
:
Arial
,
Helvetica
,
sans-serif
;
font-size
:
250%
;
font-size
:
250%
;
}
}
h2
,
h3
{
h2
,
h3
{
color
:
#444
;
color
:
#444
;
font-family
:
Arial
,
Helvetica
,
sans-serif
;
font-family
:
Arial
,
Helvetica
,
sans-serif
;
font-weight
:
lighter
;
font-weight
:
lighter
;
}
}
body
{
body
{
margin
:
2em
;
margin
:
2em
;
}
}
/* https://github.com/electron/electron/issues/7661#event-827104990 */
webview
[
hidden
]
{
width
:
0
;
height
:
0
;
flex
:
0
1
;
display
:
block
;
}
#candy
{
flex
:
0
1
;
}
\ No newline at end of file
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