Skip to content

O
OpenBoard
Commit 450c7859 authored by Ilia Ryabokon's avatar Ilia Ryabokon
Browse files
Options

Strange merge

parents 04672119 5510a30b
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 24 deletions
ReleaseNotes.pdf
View file @ 450c7859
No preview for this file type
release.win7.vc9.bat
View file @ 450c7859
......@@ -38,7 +38,7 @@ REM is correct. This is important because installer
REM pick up dll from this directory
IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR
REM rmdir /S /Q %BUILD_DIR%
rmdir /S /Q %BUILD_DIR%
set EDITION=MNEMIS_EDITION
......
resources/etc/freezedWidgetWrapper.html
View file @ 450c7859
......@@ -9,9 +9,19 @@
width: 100%;
}
div{
#freezed{
text-align: center;
border: 5px #ccc outset;
border: 5px solid #ccc;
border-radius: 80px;
box-shadow: inset 0 0 30px rgba(66,66,66,0.5);
}
.loading{
color: #999;
font-weight: bold;
font-size: large;
margin-top: 5px;
margin-left: 5px;
}
</style>
<script type="text/javascript">
......@@ -42,6 +52,6 @@
</script>
</head>
<body>
<div id="freezed">Widget freezed.</div>
<div id="freezed"><img src="img/loading.gif"/><div class="loading">Loading ...</div></div>
</body>
</html>
\ No newline at end of file
resources/library/interactivities/Ass images.wgt/css/basic.css
View file @ 450c7859
......@@ -64,7 +64,7 @@ body{
.sub_cont{
width: 100%;
padding: 0;
margin: 20px 0 0 0;
margin: 20px 0 5px 0;
min-height: 60px;
}
......@@ -84,7 +84,7 @@ body{
}
.imgs_answers_gray{
}
.imgs_answers_green{
......@@ -114,11 +114,12 @@ body{
min-height: 40px;
max-height: 60px;
float: right;
overflow: auto;
overflow-x: hidden;
background-color: #ccc;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
padding-left: 10px;
padding-left: 10px;
word-break: break-all;
}
.close_cont{
......@@ -207,7 +208,7 @@ body{
}
.dropBack{
}
/* new design */
......@@ -417,5 +418,5 @@ body{
}
.open{
}
\ No newline at end of file
resources/library/interactivities/Ass sons.wgt/css/basic.css
View file @ 450c7859
......@@ -218,6 +218,7 @@ body{
overflow-x: hidden;
float: right;
margin-left: 20px;
word-break: break-all;
}
.play, .stop{
......
resources/library/interactivities/Choisir.wgt/css/basic.css
View file @ 450c7859
......@@ -149,12 +149,10 @@ body{
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size: small;
border: 3px solid #ccc;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: #dadada -1px 0 4px;
-webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px;
color: white;
word-break: break-all;
}
.qstContentDisplay{
......@@ -169,6 +167,7 @@ body{
border: 1px solid #DFDFDE;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
word-break: break-all;
}
.ansDiv{
......@@ -222,12 +221,10 @@ body{
overflow-x: hidden;
float: left;
border: 3px solid #ccc;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: #dadada -1px 0 4px;
-webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px;
color: white;
word-break: break-all;
}
.ansContentDisplay{
......@@ -244,6 +241,7 @@ body{
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
color: white;
word-break: break-all;
}
.ansDelete{
......
resources/library/interactivities/Ordre images.wgt/css/basic.css
View file @ 450c7859
......@@ -60,7 +60,7 @@ body{
.sub_cont{
width: 100%;
padding: 0;
margin: 20px 0 0 0;
margin: 20px 0 5px 0;
min-height: 60px;
}
......@@ -93,6 +93,7 @@ body{
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
padding-left: 10px;
word-break: break-all;
}
.close_cont{
......
resources/library/interactivities/Ordre lettres.wgt/css/basic.css
View file @ 450c7859
......@@ -172,6 +172,7 @@ body{
overflow-x: hidden;
float: right;
margin-left: 20px;
word-break: break-all;
}
.play, .stop{
......@@ -205,16 +206,15 @@ body{
.audio_answer{
min-height: 50px;
min-width: 200px;
max-width: 700px;
margin: 5px 10px;
padding: 0 10px;
background-color: white;
display: inline-block;
position: relative;
border: 1px solid #ccc;
-moz-box-shadow: #ccc -1px 0 4px;
-webkit-box-shadow: #ccc -1px 0 4px;
box-shadow: #ccc -1px 0 4px;
font-size: 230%;
word-wrap: break-word;
}
/*new design*/
......
resources/library/interactivities/Ordre lettres.wgt/js/script.js
View file @ 450c7859
......@@ -337,7 +337,7 @@ function showExample(){
var audio_block = $("<div class='audio_block'>").appendTo(text);
$("<div class='play'>").appendTo(audio_block);
$("<div class='replay'>").appendTo(audio_block);
var source = $("<source/>").attr("src", "objects/beep.wav");
var source = $("<source/>").attr("src", "objects/beep.mp3");
var audio = $("<audio>").appendTo(audio_block);
audio.append(source);
$("<input type='hidden'/>").appendTo(audio_block);
......
resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js
View file @ 450c7859
......@@ -331,7 +331,7 @@ function showExample(){
var audio_block = $("<div class='audio_block'>").appendTo(text);
$("<div class='play'>").appendTo(audio_block);
$("<div class='replay'>").appendTo(audio_block);
var source = $("<source/>").attr("src", "../../objects/beep.wav");
var source = $("<source/>").attr("src", "objects/exemple.mp3");
var audio = $("<audio>").appendTo(audio_block);
audio.append(source);
$("<input type='hidden'/>").appendTo(audio_block);
......
resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js
View file @ 450c7859
......@@ -332,7 +332,7 @@ function showExample(){
var audio_block = $("<div class='audio_block'>").appendTo(text);
$("<div class='play'>").appendTo(audio_block);
$("<div class='replay'>").appendTo(audio_block);
var source = $("<source/>").attr("src", "../../objects/beep.wav");
var source = $("<source/>").attr("src", "objects/example.mp3");
var audio = $("<audio>").appendTo(audio_block);
audio.append(source);
$("<input type='hidden'/>").appendTo(audio_block);
......
resources/library/interactivities/Selectionner.wgt/css/basic.css
View file @ 450c7859
......@@ -94,6 +94,7 @@ body{
border-bottom-left-radius: 10px;
padding-left: 10px;
display: block;
word-break: break-all;
}
.close_cont{
......
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