Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4855c8b3
authored
Oct 28, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: change bootstrap tour to introjs
Note: introjs 1.0.0 doesn't work with bootstrap
parent
e3adfe35
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
22 deletions
+18
-22
circle/bower.json
+2
-1
circle/circle/settings/base.py
+2
-2
circle/dashboard/static/dashboard/dashboard.less
+14
-0
circle/dashboard/static/dashboard/introjs/intro.min.js
+0
-0
circle/dashboard/static/dashboard/introjs/introjs.min.css
+0
-12
circle/dashboard/templates/dashboard/base.html
+0
-7
No files found.
circle/bower.json
View file @
4855c8b3
...
...
@@ -18,6 +18,7 @@
"bootstrap-tour"
:
"~0.9.3"
,
"jquery-knob"
:
"~1.2.9"
,
"jquery-simple-slider"
:
"https://github.com/BME-IK/jquery-simple-slider.git"
,
"bootbox"
:
"~4.3.0"
"bootbox"
:
"~4.3.0"
,
"intro.js"
:
"0.9.0"
}
}
circle/circle/settings/base.py
View file @
4855c8b3
...
...
@@ -185,7 +185,7 @@ PIPELINE_CSS = {
"bootstrap/dist/css/bootstrap-theme.css"
,
"fontawesome/css/font-awesome.css"
,
"jquery-simple-slider/css/simple-slider.css"
,
"
bootstrap-tour/build/css/bootstrap-tour
.css"
,
"
intro.js/introjs
.css"
,
"template.less"
,
"dashboard/dashboard.less"
,
"network/network.less"
,
...
...
@@ -199,7 +199,7 @@ PIPELINE_JS = {
# "jquery/dist/jquery.js", # included separately
"bootbox/bootbox.js"
,
"bootstrap/dist/js/bootstrap.js"
,
"
bootstrap-tour/build/css/bootstrap-tour
.js"
,
"
intro.js/intro
.js"
,
"jquery-knob/dist/jquery.knob.min.js"
,
"jquery-simple-slider/js/simple-slider.js"
,
"dashboard/dashboard.js"
,
...
...
circle/dashboard/static/dashboard/dashboard.less
View file @
4855c8b3
...
...
@@ -1104,3 +1104,17 @@ textarea[name="new_members"] {
white-space: nowrap;
text-align: center;
}
/* for introjs
* newer version has this fixed
* but it doesn't work w bootstrap 3.2.0
*/
.introjs-helperLayer *,
.introjs-helperLayer *:before,
.introjs-helperLayer *:after {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-ms-box-sizing: content-box;
-o-box-sizing: content-box;
box-sizing: content-box;
}
circle/dashboard/static/dashboard/introjs/intro.min.js
deleted
100644 → 0
View file @
e3adfe35
This diff is collapsed.
Click to expand it.
circle/dashboard/static/dashboard/introjs/introjs.min.css
deleted
100644 → 0
View file @
e3adfe35
.introjs-overlay
{
position
:
absolute
;
z-index
:
999999
;
background-color
:
#000
;
opacity
:
0
;
background
:
-moz-radial-gradient
(
center
,
ellipse
cover
,
rgba
(
0
,
0
,
0
,
0.4
)
0
,
rgba
(
0
,
0
,
0
,
0.9
)
100%
);
background
:
-webkit-gradient
(
radial
,
center
center
,
0px
,
center
center
,
100%
,
color-stop
(
0%
,
rgba
(
0
,
0
,
0
,
0.4
)),
color-stop
(
100%
,
rgba
(
0
,
0
,
0
,
0.9
)));
background
:
-webkit-radial-gradient
(
center
,
ellipse
cover
,
rgba
(
0
,
0
,
0
,
0.4
)
0
,
rgba
(
0
,
0
,
0
,
0.9
)
100%
);
background
:
-o-radial-gradient
(
center
,
ellipse
cover
,
rgba
(
0
,
0
,
0
,
0.4
)
0
,
rgba
(
0
,
0
,
0
,
0.9
)
100%
);
background
:
-ms-radial-gradient
(
center
,
ellipse
cover
,
rgba
(
0
,
0
,
0
,
0.4
)
0
,
rgba
(
0
,
0
,
0
,
0.9
)
100%
);
background
:
radial-gradient
(
center
,
ellipse
cover
,
rgba
(
0
,
0
,
0
,
0.4
)
0
,
rgba
(
0
,
0
,
0
,
0.9
)
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#66000000'
,
endColorstr
=
'#e6000000'
,
GradientType
=
1
);
-ms-filter
:
"alpha(opacity=50)"
;
filter
:
alpha
(
opacity
=
50
);
-webkit-transition
:
all
.3s
ease-out
;
-moz-transition
:
all
.3s
ease-out
;
-ms-transition
:
all
.3s
ease-out
;
-o-transition
:
all
.3s
ease-out
;
transition
:
all
.3s
ease-out
}
.introjs-fixParent
{
z-index
:
auto
!important
;
opacity
:
1.0
!important
}
.introjs-showElement
,
tr
.introjs-showElement
>
td
,
tr
.introjs-showElement
>
th
{
z-index
:
9999999
!important
}
.introjs-relativePosition
,
tr
.introjs-showElement
>
td
,
tr
.introjs-showElement
>
th
{
position
:
relative
}
.introjs-helperLayer
{
position
:
absolute
;
z-index
:
9999998
;
background-color
:
#FFF
;
background-color
:
rgba
(
255
,
255
,
255
,
.9
);
border
:
1px
solid
#777
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.5
);
border-radius
:
4px
;
box-shadow
:
0
2px
15px
rgba
(
0
,
0
,
0
,
.4
);
-webkit-transition
:
all
.3s
ease-out
;
-moz-transition
:
all
.3s
ease-out
;
-ms-transition
:
all
.3s
ease-out
;
-o-transition
:
all
.3s
ease-out
;
transition
:
all
.3s
ease-out
}
.introjs-helperNumberLayer
{
position
:
absolute
;
top
:
-16px
;
left
:
-16px
;
z-index
:
9999999999
!important
;
padding
:
2px
;
font-family
:
Arial
,
verdana
,
tahoma
;
font-size
:
13px
;
font-weight
:
bold
;
color
:
white
;
text-align
:
center
;
text-shadow
:
1px
1px
1px
rgba
(
0
,
0
,
0
,
.3
);
background
:
#ff3019
;
background
:
-webkit-linear-gradient
(
top
,
#ff3019
0
,
#cf0404
100%
);
background
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#ff3019
),
color-stop
(
100%
,
#cf0404
));
background
:
-moz-linear-gradient
(
top
,
#ff3019
0
,
#cf0404
100%
);
background
:
-ms-linear-gradient
(
top
,
#ff3019
0
,
#cf0404
100%
);
background
:
-o-linear-gradient
(
top
,
#ff3019
0
,
#cf0404
100%
);
background
:
linear-gradient
(
to
bottom
,
#ff3019
0
,
#cf0404
100%
);
width
:
20px
;
height
:
20px
;
line-height
:
20px
;
border
:
3px
solid
white
;
border-radius
:
50%
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff3019'
,
endColorstr
=
'#cf0404'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
Shadow
(
direction
=
135
,
strength
=
2
,
color
=
ff0000
);
box-shadow
:
0
2px
5px
rgba
(
0
,
0
,
0
,
.4
)}
.introjs-arrow
{
border
:
5px
solid
white
;
content
:
''
;
position
:
absolute
}
.introjs-arrow.top
{
top
:
-10px
;
border-top-color
:
transparent
;
border-right-color
:
transparent
;
border-bottom-color
:
white
;
border-left-color
:
transparent
}
.introjs-arrow.top-right
{
top
:
-10px
;
right
:
10px
;
border-top-color
:
transparent
;
border-right-color
:
transparent
;
border-bottom-color
:
white
;
border-left-color
:
transparent
}
.introjs-arrow.top-middle
{
top
:
-10px
;
left
:
50%
;
margin-left
:
-5px
;
border-top-color
:
transparent
;
border-right-color
:
transparent
;
border-bottom-color
:
white
;
border-left-color
:
transparent
}
.introjs-arrow.right
{
right
:
-10px
;
top
:
10px
;
border-top-color
:
transparent
;
border-right-color
:
transparent
;
border-bottom-color
:
transparent
;
border-left-color
:
white
}
.introjs-arrow.bottom
{
bottom
:
-10px
;
border-top-color
:
white
;
border-right-color
:
transparent
;
border-bottom-color
:
transparent
;
border-left-color
:
transparent
}
.introjs-arrow.left
{
left
:
-10px
;
top
:
10px
;
border-top-color
:
transparent
;
border-right-color
:
white
;
border-bottom-color
:
transparent
;
border-left-color
:
transparent
}
.introjs-tooltip
{
position
:
absolute
;
padding
:
10px
;
background-color
:
white
;
min-width
:
200px
;
max-width
:
300px
;
border-radius
:
3px
;
box-shadow
:
0
1px
10px
rgba
(
0
,
0
,
0
,
.4
);
-webkit-transition
:
opacity
.1s
ease-out
;
-moz-transition
:
opacity
.1s
ease-out
;
-ms-transition
:
opacity
.1s
ease-out
;
-o-transition
:
opacity
.1s
ease-out
;
transition
:
opacity
.1s
ease-out
}
.introjs-tooltipbuttons
{
text-align
:
right
}
.introjs-button
{
position
:
relative
;
overflow
:
visible
;
display
:
inline-block
;
padding
:
.3em
.8em
;
border
:
1px
solid
#d4d4d4
;
margin
:
0
;
text-decoration
:
none
;
text-shadow
:
1px
1px
0
#fff
;
font
:
11px
/
normal
sans-serif
;
color
:
#333
;
white-space
:
nowrap
;
cursor
:
pointer
;
outline
:
0
;
background-color
:
#ececec
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#f4f4f4
),
to
(
#ececec
));
background-image
:
-moz-linear-gradient
(
#f4f4f4
,
#ececec
);
background-image
:
-o-linear-gradient
(
#f4f4f4
,
#ececec
);
background-image
:
linear-gradient
(
#f4f4f4
,
#ececec
);
-webkit-background-clip
:
padding
;
-moz-background-clip
:
padding
;
-o-background-clip
:
padding-box
;
-webkit-border-radius
:
.2em
;
-moz-border-radius
:
.2em
;
border-radius
:
.2em
;
zoom
:
1
;
*
display
:
inline
;
margin-top
:
10px
}
.introjs-button
:hover
{
border-color
:
#bcbcbc
;
text-decoration
:
none
;
box-shadow
:
0
1px
1px
#e3e3e3
}
.introjs-button
:focus
,
.introjs-button
:active
{
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#ececec
),
to
(
#f4f4f4
));
background-image
:
-moz-linear-gradient
(
#ececec
,
#f4f4f4
);
background-image
:
-o-linear-gradient
(
#ececec
,
#f4f4f4
);
background-image
:
linear-gradient
(
#ececec
,
#f4f4f4
)}
.introjs-button
::-moz-focus-inner
{
padding
:
0
;
border
:
0
}
.introjs-skipbutton
{
margin-right
:
5px
;
color
:
#7a7a7a
}
.introjs-prevbutton
{
-webkit-border-radius
:
.2em
0
0
.2em
;
-moz-border-radius
:
.2em
0
0
.2em
;
border-radius
:
.2em
0
0
.2em
;
border-right
:
0
}
.introjs-nextbutton
{
-webkit-border-radius
:
0
.2em
.2em
0
;
-moz-border-radius
:
0
.2em
.2em
0
;
border-radius
:
0
.2em
.2em
0
}
.introjs-disabled
,
.introjs-disabled
:hover
,
.introjs-disabled
:focus
{
color
:
#9a9a9a
;
border-color
:
#d4d4d4
;
box-shadow
:
none
;
cursor
:
default
;
background-color
:
#f4f4f4
;
background-image
:
none
;
text-decoration
:
none
}
.introjs-bullets
{
text-align
:
center
}
.introjs-bullets
ul
{
clear
:
both
;
margin
:
15px
auto
0
;
padding
:
0
;
display
:
inline-block
}
.introjs-bullets
ul
li
{
list-style
:
none
;
float
:
left
;
margin
:
0
2px
}
.introjs-bullets
ul
li
a
{
display
:
block
;
width
:
6px
;
height
:
6px
;
background
:
#ccc
;
border-radius
:
10px
;
-moz-border-radius
:
10px
;
-webkit-border-radius
:
10px
;
text-decoration
:
none
}
.introjs-bullets
ul
li
a
:hover
{
background
:
#999
}
.introjs-bullets
ul
li
a
.active
{
background
:
#999
}
.introjsFloatingElement
{
position
:
absolute
;
height
:
0
;
width
:
0
;
left
:
50%
;
top
:
50%
}
.introjs-helperLayer
*,
.introjs-helperLayer
*
:before
,
.introjs-helperLayer
*
:after
{
-webkit-box-sizing
:
content-box
;
-moz-box-sizing
:
content-box
;
-ms-box-sizing
:
content-box
;
-o-box-sizing
:
content-box
;
box-sizing
:
content-box
;
}
circle/dashboard/templates/dashboard/base.html
View file @
4855c8b3
...
...
@@ -5,13 +5,6 @@
{% block title-site %}Dashboard | CIRCLE{% endblock %}
{% block extra_link %}
<link
rel=
"stylesheet"
href=
"{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider/css/simple-slider.css"
/>
<link
rel=
"stylesheet"
href=
"{{ STATIC_URL }}dashboard/introjs/introjs.min.css"
>
<link
href=
"{{ STATIC_URL }}dashboard/dashboard.css"
rel=
"stylesheet"
>
{% endblock %}
{% block navbar-brand %}
<a
class=
"navbar-brand"
href=
"{% url "
dashboard
.
index
"
%}"
style=
"padding: 10px 15px;"
>
{% include "branding.html" %}
...
...
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