Skip to content

Commit

Permalink
Merge pull request #19 from MasterK0927/keshav_changes
Browse files Browse the repository at this point in the history
chnages in  omnibox and background image
  • Loading branch information
MasterK0927 authored Apr 6, 2024
2 parents cbdae3d + f97a1d2 commit 0f679d4
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
32 changes: 16 additions & 16 deletions browser/ui/views/brave_actions/brave_actions_container.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ void BraveActionsContainer::Init() {
SetLayoutManager(std::move(vertical_container_layout));

// children
RoundedSeparator* brave_button_separator_ = new RoundedSeparator();
// TODO(petemill): theme color
brave_button_separator_->SetColor(SkColorSetRGB(0xb2, 0xb5, 0xb7));
constexpr int kSeparatorMargin = 3;
constexpr int kSeparatorWidth = 1;
brave_button_separator_->SetPreferredSize(
gfx::Size(kSeparatorWidth + kSeparatorMargin * 2,
GetLayoutConstant(LOCATION_BAR_ICON_SIZE)));
// separator left & right margin
brave_button_separator_->SetBorder(views::CreateEmptyBorder(
gfx::Insets::TLBR(0, kSeparatorMargin, 0, kSeparatorMargin)));
// Just in case the extensions load before this function does (not likely!)
// make sure separator is at index 0
AddChildViewAt(brave_button_separator_, 0);
AddActionViewForShields();
AddActionViewForRewards();
// RoundedSeparator* brave_button_separator_ = new RoundedSeparator();
// // TODO(petemill): theme color
// brave_button_separator_->SetColor(SkColorSetRGB(0xb2, 0xb5, 0xb7));
// constexpr int kSeparatorMargin = 3;
// constexpr int kSeparatorWidth = 1;
// brave_button_separator_->SetPreferredSize(
// gfx::Size(kSeparatorWidth + kSeparatorMargin * 2,
// GetLayoutConstant(LOCATION_BAR_ICON_SIZE)));
// // separator left & right margin
// brave_button_separator_->SetBorder(views::CreateEmptyBorder(
// gfx::Insets::TLBR(0, kSeparatorMargin, 0, kSeparatorMargin)));
// // Just in case the extensions load before this function does (not likely!)
// // make sure separator is at index 0
// AddChildViewAt(brave_button_separator_, 0);
// AddActionViewForShields();
// AddActionViewForRewards();

// React to Brave Rewards preferences changes.
show_brave_rewards_button_.Init(
Expand Down
24 changes: 12 additions & 12 deletions components/brave_new_tab_ui/components/default/footer/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {
// IconButtonContainer,
// IconButtonSideText,
IconLink,
Label,
Link,
// Label,
// Link,
Navigation,
PhotoName
// PhotoName
} from '..'
import * as S from '../page'

Expand All @@ -40,17 +40,17 @@ export interface Props {

export default class FooterInfo extends React.PureComponent<Props, {}> {
render () {
const {
// textDirection,
// supportsBraveTalk,
backgroundImageInfo,
showPhotoInfo,
// onClickSettings
} = this.props
// const {
// // textDirection,
// // supportsBraveTalk,
// backgroundImageInfo,
// showPhotoInfo,
// // onClickSettings
// } = this.props

return (
<>
{ showPhotoInfo && backgroundImageInfo?.type === 'brave' &&
{/* { showPhotoInfo && backgroundImageInfo?.type === 'brave' &&
<S.GridItemCredits>
<PhotoName>
{`${getLocale('photoBy')} `}
Expand All @@ -62,7 +62,7 @@ export default class FooterInfo extends React.PureComponent<Props, {}> {
}
</PhotoName>
</S.GridItemCredits>
}
} */}
<S.GridItemNavigation>
<Navigation>
{/* <IconButtonContainer textDirection={textDirection}>
Expand Down

0 comments on commit 0f679d4

Please sign in to comment.